diff --git a/.gitignore b/.gitignore
index b959dd4..93c4b28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,7 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+*/target/*
+out/*.jar
+target/lib/*.jar
\ No newline at end of file
diff --git a/bin/go-plugin-api-15.1.0.jar b/bin/go-plugin-api-15.1.0.jar
old mode 100644
new mode 100755
diff --git a/bin/gocd-check_mk-plugin-1.0.0.jar b/bin/gocd-check_mk-plugin-1.0.0.jar
index 69c3f89..445cde3 100644
Binary files a/bin/gocd-check_mk-plugin-1.0.0.jar and b/bin/gocd-check_mk-plugin-1.0.0.jar differ
diff --git a/bin/gocd-docker-compose-plugin-1.0.0.jar b/bin/gocd-docker-compose-plugin-1.0.0.jar
new file mode 100644
index 0000000..8e7a556
Binary files /dev/null and b/bin/gocd-docker-compose-plugin-1.0.0.jar differ
diff --git a/bin/gocd-docker-machine-plugin-1.0.0.jar b/bin/gocd-docker-machine-plugin-1.0.0.jar
new file mode 100644
index 0000000..2435dbe
Binary files /dev/null and b/bin/gocd-docker-machine-plugin-1.0.0.jar differ
diff --git a/bin/gocd-docker-pipeline-plugin-1.0.0.jar b/bin/gocd-docker-pipeline-plugin-1.0.0.jar
index 689aa6a..052d2ad 100644
Binary files a/bin/gocd-docker-pipeline-plugin-1.0.0.jar and b/bin/gocd-docker-pipeline-plugin-1.0.0.jar differ
diff --git a/bin/gocd-docker-plugin-2.0.0.jar b/bin/gocd-docker-plugin-2.0.0.jar
new file mode 100755
index 0000000..6b7c142
Binary files /dev/null and b/bin/gocd-docker-plugin-2.0.0.jar differ
diff --git a/bin/gocd-fetch-any-artifact-plugin-1.0.0.jar b/bin/gocd-fetch-any-artifact-plugin-1.0.0.jar
new file mode 100644
index 0000000..da6cec8
Binary files /dev/null and b/bin/gocd-fetch-any-artifact-plugin-1.0.0.jar differ
diff --git a/bin/gocd-fortify-plugin-1.0.0.jar b/bin/gocd-fortify-plugin-1.0.0.jar
new file mode 100755
index 0000000..522f7e4
Binary files /dev/null and b/bin/gocd-fortify-plugin-1.0.0.jar differ
diff --git a/bin/gocd-nessus-scan-plugin-1.0.0.jar b/bin/gocd-nessus-scan-plugin-1.0.0.jar
old mode 100644
new mode 100755
diff --git a/bin/gocd-plugin-common-1.0.0.jar b/bin/gocd-plugin-common-1.0.0.jar
old mode 100644
new mode 100755
diff --git a/bin/gocd-sonar-qualitygates-plugin-1.0.0.jar b/bin/gocd-sonar-qualitygates-plugin-1.0.0.jar
old mode 100644
new mode 100755
index 28333a3..b26e310
Binary files a/bin/gocd-sonar-qualitygates-plugin-1.0.0.jar and b/bin/gocd-sonar-qualitygates-plugin-1.0.0.jar differ
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..5f56e85
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+mvn install:install-file \
+-Dfile=bin/go-plugin-api-15.1.0.jar \
+-DgroupId=com.thoughtworks.go \
+-DartifactId=go-plugin-api \
+-Dversion=15.1.0 \
+-Dpackaging=jar && \
+\
+mvn clean \
+package \
+-DskipTests && \
+\
+mvn cobertura:cobertura
diff --git a/check_mk-plugin/pom.xml b/check_mk-plugin/pom.xml
old mode 100644
new mode 100755
index 5514899..1cfdb26
--- a/check_mk-plugin/pom.xml
+++ b/check_mk-plugin/pom.xml
@@ -9,8 +9,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <go.target.version>15.1.0</go.target.version>
-        <go.version>15.1.0</go.version>
+        <go.target.version>16.4.0</go.target.version>
+        <go.version>16.4.0</go.version>
         <plugin.version>${project.version}</plugin.version>
 
         <sonar.java.coveragePlugin>cobertura</sonar.java.coveragePlugin>
diff --git a/check_mk-plugin/resources/plugin.xml b/check_mk-plugin/resources/plugin.xml
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/resources/test.properties b/check_mk-plugin/resources/test.properties
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/resources/views/checkMk.template.html b/check_mk-plugin/resources/views/checkMk.template.html
old mode 100644
new mode 100755
index be572b0..2f93da0
--- a/check_mk-plugin/resources/views/checkMk.template.html
+++ b/check_mk-plugin/resources/views/checkMk.template.html
@@ -25,6 +25,7 @@
 <select ng-init="SelectedAction='default'" ng-model="SelectedAction" >
     <option selected disabled value="default">Select action</option>
     <option value="add">Add Host</option>
+    <option value="edit">Edit Host</option>
     <option value="remove">Remove Host</option>
 </select>
 </br>
@@ -59,6 +60,35 @@
             </div>
         </div>
     </div>
+    <div ng-switch-when="edit">
+        <div class="form_item_block">
+            <label>Hostname:<span class="asterisk">*</span>
+            </label>
+            <input type="text" ng-model="Hostname" ng-required="true">
+            </input>
+            <div role="alert">
+                <span class="error" color="red" ng-show="GOINPUTNAME[Hostname].$error.required" >Required!</span>
+            </div>
+        </div>
+        <div class="form_item_block">
+            <label>New Host ip:<span class="asterisk">*</span>
+            </label>
+            <input type="text" ng-model="HostIp" ng-required="true">
+            </input>
+            <div role="alert">
+                <span class="error" color="red" ng-show="GOINPUTNAME[HostIp].$error.required" >Required!</span>
+            </div>
+        </div>
+        <div class="form_item_block">
+            <label>New Folder path:<span class="asterisk">*</span>
+            </label>
+            <input type="text" ng-model="FolderPath" ng-required="true">
+            </input>
+            <div role="alert">
+                <span class="error" color="red" ng-show="GOINPUTNAME[FolderPath].$error.required" >Required!</span>
+            </div>
+        </div>
+    </div>
     <div ng-switch-when="remove">
         <div class="form_item_block">
             <label>Hostname:<span class="asterisk">*</span>
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/ActivateChangesException.java b/check_mk-plugin/src/com/tw/go/task/check_mk/ActivateChangesException.java
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/ActivateChangesJob.java b/check_mk-plugin/src/com/tw/go/task/check_mk/ActivateChangesJob.java
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/AddHostException.java b/check_mk-plugin/src/com/tw/go/task/check_mk/AddHostException.java
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/AddHostJob.java b/check_mk-plugin/src/com/tw/go/task/check_mk/AddHostJob.java
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/AddHostTaskExecutor.java b/check_mk-plugin/src/com/tw/go/task/check_mk/AddHostTaskExecutor.java
old mode 100644
new mode 100755
index 0477bee..2e4f0e7
--- a/check_mk-plugin/src/com/tw/go/task/check_mk/AddHostTaskExecutor.java
+++ b/check_mk-plugin/src/com/tw/go/task/check_mk/AddHostTaskExecutor.java
@@ -15,7 +15,7 @@ public AddHostTaskExecutor(JobConsoleLogger console, Context context, Map config
         super(console, context, config);
     }
 
-    public Result execute() {
+    public Result execute() throws Exception {
         try {
             String hostname = (String) ((Map) this.config.get(CheckMkTask.HOSTNAME)).get("value");
             String serverIp = (String) ((Map) this.config.get(CheckMkTask.HOST_IP)).get("value");
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/CheckMkClient.java b/check_mk-plugin/src/com/tw/go/task/check_mk/CheckMkClient.java
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/CheckMkJob.java b/check_mk-plugin/src/com/tw/go/task/check_mk/CheckMkJob.java
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/CheckMkRequestObjectFactory.java b/check_mk-plugin/src/com/tw/go/task/check_mk/CheckMkRequestObjectFactory.java
old mode 100644
new mode 100755
index a391cd2..2c9f08d
--- a/check_mk-plugin/src/com/tw/go/task/check_mk/CheckMkRequestObjectFactory.java
+++ b/check_mk-plugin/src/com/tw/go/task/check_mk/CheckMkRequestObjectFactory.java
@@ -14,6 +14,17 @@ public static JSONObject CreateAddHostObject(String folderName, String hostname,
         return objAddHost;
     }
 
+    public static JSONObject CreateEditHostObject(String folderName, String hostname, String serverIp)throws Exception
+    {
+        JSONObject objCreateAttributes = new JSONObject();
+        objCreateAttributes.put("ipaddress", serverIp);
+        JSONObject objAddHost= new JSONObject();
+        objAddHost.put("folder", folderName);
+        objAddHost.put("hostname", hostname);
+        objAddHost.put("attributes", objCreateAttributes);
+        return objAddHost;
+    }
+
     public static JSONObject CreateRemoveHostObject(String hostname)throws Exception
     {
         JSONObject objRemoveHost= new JSONObject();
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/CheckMkTask.java b/check_mk-plugin/src/com/tw/go/task/check_mk/CheckMkTask.java
old mode 100644
new mode 100755
index 87aab3c..68cf11b
--- a/check_mk-plugin/src/com/tw/go/task/check_mk/CheckMkTask.java
+++ b/check_mk-plugin/src/com/tw/go/task/check_mk/CheckMkTask.java
@@ -2,29 +2,25 @@
 package com.tw.go.task.check_mk;
 
 import com.google.gson.GsonBuilder;
-import com.thoughtworks.go.plugin.api.GoApplicationAccessor;
-import com.thoughtworks.go.plugin.api.GoPlugin;
 import com.thoughtworks.go.plugin.api.GoPluginIdentifier;
 import com.thoughtworks.go.plugin.api.annotation.Extension;
-import com.thoughtworks.go.plugin.api.exceptions.UnhandledRequestTypeException;
 import com.thoughtworks.go.plugin.api.logging.Logger;
 import com.thoughtworks.go.plugin.api.request.GoPluginApiRequest;
 import com.thoughtworks.go.plugin.api.response.DefaultGoApiResponse;
 import com.thoughtworks.go.plugin.api.response.DefaultGoPluginApiResponse;
 import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
-import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
-import com.tw.go.plugin.common.Context;
-import com.tw.go.plugin.common.Result;
+import com.tw.go.plugin.common.*;
 import org.apache.commons.io.IOUtils;
 
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
 @Extension
-public class CheckMkTask implements GoPlugin {
+public class CheckMkTask extends BaseGoPlugin {
 
-    public static final String CHECK_MK_SERVER="Server";
+    public static final String CHECK_MK_SERVER = "Server";
     public static final String HOSTNAME = "Hostname";
     public static final String HOST_IP = "HostIp";
     public static final String FOLDER_PATH = "FolderPath";
@@ -34,29 +30,12 @@ public class CheckMkTask implements GoPlugin {
     private Logger logger = Logger.getLoggerFor(CheckMkTask.class);
 
     @Override
-    public void initializeGoApplicationAccessor(GoApplicationAccessor goApplicationAccessor) {
-    }
-
-    @Override
-    public GoPluginApiResponse handle(GoPluginApiRequest request) throws UnhandledRequestTypeException {
-        if ("configuration".equals(request.requestName())) {
-            return handleGetConfigRequest();
-        } else if ("validate".equals(request.requestName())) {
-            return handleValidation(request);
-        } else if ("execute".equals(request.requestName())) {
-            return handleTaskExecution(request);
-        } else if ("view".equals(request.requestName())) {
-            return handleTaskView();
-        }
-        throw new UnhandledRequestTypeException(request.requestName());
-    }
-
-    private GoPluginApiResponse handleTaskView() {
+    protected GoPluginApiResponse handleTaskView(GoPluginApiRequest request) {
         int responseCode = DefaultGoApiResponse.SUCCESS_RESPONSE_CODE;
         HashMap view = new HashMap();
         view.put("displayValue", "Monitoring - Check MK");
         try {
-            String checkMkTemplate=IOUtils.toString(getClass().getResourceAsStream("/views/checkMk.template.html"), "UTF-8");
+            String checkMkTemplate = IOUtils.toString(getClass().getResourceAsStream("/views/checkMk.template.html"), "UTF-8");
             view.put("template", checkMkTemplate);
         } catch (Exception e) {
             responseCode = DefaultGoApiResponse.INTERNAL_ERROR;
@@ -67,29 +46,26 @@ private GoPluginApiResponse handleTaskView() {
         return createResponse(responseCode, view);
     }
 
-    private GoPluginApiResponse handleTaskExecution(GoPluginApiRequest request) {
+    @Override
+    protected GoPluginApiResponse handleTaskExecution(GoPluginApiRequest request) throws Exception {
         Map executionRequest = (Map) new GsonBuilder().create().fromJson(request.requestBody(), Object.class);
-        Map config = (Map) executionRequest.get("config");
-        Map contextMap = (Map) executionRequest.get("context");
-        JobConsoleLogger consoleLogger=JobConsoleLogger.getConsoleLogger();
+
+        Map<String, Map> config = (Map) executionRequest.get("config");
+
+        Context context = new Context((Map) executionRequest.get("context"));
+
         try {
-            CheckMkTaskExecutor checkMkTaskExecutor=TaskExecutorFactory.Create(consoleLogger, new Context(contextMap), config);
+            CheckMkTaskExecutor checkMkTaskExecutor = TaskExecutorFactory.Create(MaskingJobConsoleLogger.getConsoleLogger(),
+                    context, config);
             Result result = checkMkTaskExecutor.execute();
             return createResponse(result.responseCode(), result.toMap());
-        }
-        catch (JobNotSupportedException e)
-        {
-            consoleLogger.printLine(e.getMessage());
-            return createResponse( DefaultGoApiResponse.INTERNAL_ERROR,null);
-        }
-        catch(Exception e)
-        {
-            consoleLogger.printLine(e.getMessage());
-            return createResponse( DefaultGoApiResponse.INTERNAL_ERROR,null);
+        } catch (JobNotSupportedException | IOException e) {
+            return success(new Result(false, e.getMessage()));
         }
     }
 
-    private GoPluginApiResponse handleValidation(GoPluginApiRequest request) {
+    @Override
+    protected GoPluginApiResponse handleValidation(GoPluginApiRequest request) {
         HashMap validationResult = new HashMap();
         int responseCode = DefaultGoPluginApiResponse.SUCCESS_RESPONSE_CODE;
         Map configMap = (Map) new GsonBuilder().create().fromJson(request.requestBody(), Object.class);
@@ -104,7 +80,8 @@ private GoPluginApiResponse handleValidation(GoPluginApiRequest request) {
 
     // return json description to tell go.cd which config properties need to be stored
     // sample and schema can be found at http://www.go.cd/documentation/developer/writing_go_plugins/task/version_1_0/configuration.html
-    private GoPluginApiResponse handleGetConfigRequest() {
+    @Override
+    protected GoPluginApiResponse handleGetConfigRequest(GoPluginApiRequest request) {
 
         HashMap config = new HashMap();
 
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/CheckMkTaskExecutor.java b/check_mk-plugin/src/com/tw/go/task/check_mk/CheckMkTaskExecutor.java
old mode 100644
new mode 100755
index a9e244c..ddc32f1
--- a/check_mk-plugin/src/com/tw/go/task/check_mk/CheckMkTaskExecutor.java
+++ b/check_mk-plugin/src/com/tw/go/task/check_mk/CheckMkTaskExecutor.java
@@ -2,7 +2,6 @@
 
 import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
 import com.tw.go.plugin.common.Context;
-import com.tw.go.plugin.common.Result;
 import com.tw.go.plugin.common.TaskExecutor;
 import org.json.JSONObject;
 
@@ -15,8 +14,6 @@ public CheckMkTaskExecutor(JobConsoleLogger console, Context context, Map config
         super(console, context, config);
     }
 
-    public abstract Result execute() ;
-
     protected String getPluginLogPrefix() {
         return "[Check_Mk Task] ";
     }
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/EditHostException.java b/check_mk-plugin/src/com/tw/go/task/check_mk/EditHostException.java
new file mode 100644
index 0000000..c1ed60f
--- /dev/null
+++ b/check_mk-plugin/src/com/tw/go/task/check_mk/EditHostException.java
@@ -0,0 +1,12 @@
+package com.tw.go.task.check_mk;
+
+import org.json.JSONObject;
+
+public class EditHostException extends Exception
+{
+    public EditHostException(JSONObject requestObject, JSONObject resultObject)
+    {
+        super("Failed to edit host "+requestObject.get("hostname")+". " +resultObject.get("result"));
+    }
+}
+
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/EditHostJob.java b/check_mk-plugin/src/com/tw/go/task/check_mk/EditHostJob.java
new file mode 100644
index 0000000..66b36a4
--- /dev/null
+++ b/check_mk-plugin/src/com/tw/go/task/check_mk/EditHostJob.java
@@ -0,0 +1,24 @@
+package com.tw.go.task.check_mk;
+
+import org.json.JSONObject;
+
+public class EditHostJob extends CheckMkJob
+{
+    public EditHostJob(ICheckMkClient checkMkClient) {
+        super(checkMkClient);
+        Action="edit_host";
+        Parameters="";
+    }
+
+    @Override
+    public String Execute(JSONObject requestObject) throws Exception {
+        JSONObject jsonResult = ExecuteWebRequest(requestObject);
+        if(!jsonResult.get("result_code").toString().equals("0"))
+        {
+            throw new EditHostException(requestObject,jsonResult);
+        }
+        return "Host "+requestObject.get("hostname")+" updated.";
+    }
+}
+
+
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/EditHostTaskExecutor.java b/check_mk-plugin/src/com/tw/go/task/check_mk/EditHostTaskExecutor.java
new file mode 100644
index 0000000..768b620
--- /dev/null
+++ b/check_mk-plugin/src/com/tw/go/task/check_mk/EditHostTaskExecutor.java
@@ -0,0 +1,43 @@
+
+package com.tw.go.task.check_mk;
+
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.Context;
+import com.tw.go.plugin.common.Result;
+import org.json.JSONObject;
+
+import java.util.Map;
+
+public class EditHostTaskExecutor extends CheckMkTaskExecutor {
+
+    public EditHostTaskExecutor(JobConsoleLogger console, Context context, Map config) {
+        super(console, context, config);
+    }
+
+    public Result execute() throws Exception {
+        try {
+            String hostname = (String) ((Map) this.config.get(CheckMkTask.HOSTNAME)).get("value");
+            String serverIp = (String) ((Map) this.config.get(CheckMkTask.HOST_IP)).get("value");
+            String folderPath = (String) ((Map) this.config.get(CheckMkTask.FOLDER_PATH)).get("value");
+            ServerCredentials credentials = CreateCredentials();
+            TryInitClient(credentials);
+            CheckMkJob checkMkJob = new EditHostJob(checkMkClient);
+            JSONObject requestObject = CheckMkRequestObjectFactory.CreateEditHostObject(folderPath, hostname, serverIp);
+            ExecuteJob(requestObject, checkMkJob);
+            return new Result(true, "Edit host was successful.");
+        } catch (Exception e) {
+            log("Exception. " + e.getMessage());
+            return new Result(false, "Edit host failed", e);
+        }
+    }
+
+    protected String getPluginLogPrefix() {
+        return "[Edit Host Task] ";
+    }
+
+    public void setCheckMkClient(ICheckMkClient checkMkClient) {
+        this.checkMkClient = checkMkClient;
+    }
+}
+
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/ICheckMkClient.java b/check_mk-plugin/src/com/tw/go/task/check_mk/ICheckMkClient.java
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/JobNotSupportedException.java b/check_mk-plugin/src/com/tw/go/task/check_mk/JobNotSupportedException.java
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/RemoveHostException.java b/check_mk-plugin/src/com/tw/go/task/check_mk/RemoveHostException.java
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/RemoveHostJob.java b/check_mk-plugin/src/com/tw/go/task/check_mk/RemoveHostJob.java
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/RemoveHostTaskExecutor.java b/check_mk-plugin/src/com/tw/go/task/check_mk/RemoveHostTaskExecutor.java
old mode 100644
new mode 100755
index a1be01a..e359c95
--- a/check_mk-plugin/src/com/tw/go/task/check_mk/RemoveHostTaskExecutor.java
+++ b/check_mk-plugin/src/com/tw/go/task/check_mk/RemoveHostTaskExecutor.java
@@ -15,7 +15,7 @@ public RemoveHostTaskExecutor(JobConsoleLogger console, Context context, Map con
         super(console, context, config);
     }
 
-    public Result execute() {
+    public Result execute() throws Exception {
         try {
             String hostname = (String) ((Map) this.config.get(CheckMkTask.HOSTNAME)).get("value");
             ServerCredentials credentials = CreateCredentials();
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/ServerCredentials.java b/check_mk-plugin/src/com/tw/go/task/check_mk/ServerCredentials.java
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/src/com/tw/go/task/check_mk/TaskExecutorFactory.java b/check_mk-plugin/src/com/tw/go/task/check_mk/TaskExecutorFactory.java
old mode 100644
new mode 100755
index c2ebb9a..39fe062
--- a/check_mk-plugin/src/com/tw/go/task/check_mk/TaskExecutorFactory.java
+++ b/check_mk-plugin/src/com/tw/go/task/check_mk/TaskExecutorFactory.java
@@ -5,15 +5,19 @@
 
 import java.util.Map;
 
-public class TaskExecutorFactory
-{
+public class TaskExecutorFactory {
     public static CheckMkTaskExecutor Create(JobConsoleLogger console, Context context, Map config) throws JobNotSupportedException {
         String action = (String) ((Map) config.get(CheckMkTask.ACTION)).get("value");
-        switch (action)
-        {
-            case "add":return new AddHostTaskExecutor(console,context,config);
-            case "remove":return new RemoveHostTaskExecutor(console,context,config);
+        switch (action) {
+            case "add":
+                return new AddHostTaskExecutor(console, context, config);
+            case "edit":
+                return new EditHostTaskExecutor(console, context, config);
+            case "remove":
+                ((Map) config.get(CheckMkTask.FOLDER_PATH)).put("value", "");
+                ((Map) config.get(CheckMkTask.HOST_IP)).put("value", "");
+                return new RemoveHostTaskExecutor(console, context, config);
         }
-        throw new JobNotSupportedException("Action "+action+" not supported!");
+        throw new JobNotSupportedException("Action " + action + " not supported!");
     }
 }
diff --git a/check_mk-plugin/test/com/tw/go/task/check_mk/ActivateChangesJobTests.java b/check_mk-plugin/test/com/tw/go/task/check_mk/ActivateChangesJobTests.java
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/test/com/tw/go/task/check_mk/AddHostJobTests.java b/check_mk-plugin/test/com/tw/go/task/check_mk/AddHostJobTests.java
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/test/com/tw/go/task/check_mk/AddHostTaskExecutorTests.java b/check_mk-plugin/test/com/tw/go/task/check_mk/AddHostTaskExecutorTests.java
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/test/com/tw/go/task/check_mk/CheckMkStub.java b/check_mk-plugin/test/com/tw/go/task/check_mk/CheckMkStub.java
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/test/com/tw/go/task/check_mk/EditHostJobTests.java b/check_mk-plugin/test/com/tw/go/task/check_mk/EditHostJobTests.java
new file mode 100644
index 0000000..d521d99
--- /dev/null
+++ b/check_mk-plugin/test/com/tw/go/task/check_mk/EditHostJobTests.java
@@ -0,0 +1,33 @@
+package com.tw.go.task.check_mk;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+public class EditHostJobTests {
+
+    @BeforeClass
+    public static void Init() throws Exception {
+        CheckMkStub.init();
+
+    }
+
+    @Test(expected = EditHostException.class)
+    public void Execute_RequestFailed_ThrowException() throws Exception {
+        CheckMkStub.SetupRequestError();
+        CheckMkJob job = new EditHostJob(CheckMkStub.checkMkClient);
+
+        job.Execute(CheckMkRequestObjectFactory.CreateEditHostObject(CheckMkStub.folderPath, CheckMkStub.hostName, CheckMkStub.hostIp));
+    }
+
+    @Test
+    public void Execute_RequestSuccess_ReturnsOkMessage() throws Exception {
+        CheckMkStub.SetupRequestOk();
+        CheckMkJob job = new EditHostJob(CheckMkStub.checkMkClient);
+
+        String result = job.Execute(CheckMkRequestObjectFactory.CreateEditHostObject(CheckMkStub.folderPath, CheckMkStub.hostName, CheckMkStub.hostIp));
+
+        assertEquals(result, "Host test updated.");
+    }
+}
+
diff --git a/check_mk-plugin/test/com/tw/go/task/check_mk/EditHostTaskExecutorTests.java b/check_mk-plugin/test/com/tw/go/task/check_mk/EditHostTaskExecutorTests.java
new file mode 100644
index 0000000..76980e6
--- /dev/null
+++ b/check_mk-plugin/test/com/tw/go/task/check_mk/EditHostTaskExecutorTests.java
@@ -0,0 +1,71 @@
+package com.tw.go.task.check_mk;
+
+import com.thoughtworks.go.plugin.api.response.DefaultGoApiResponse;
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.Context;
+import com.tw.go.plugin.common.Result;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+public class EditHostTaskExecutorTests {
+    static JobConsoleLogger consoleLogger;
+    static Context context;
+    static Map config;
+
+    @BeforeClass
+    public static void Init() throws Exception {
+        CheckMkStub.init();
+        config = Mockito.mock(Map.class);
+        consoleLogger = Mockito.mock(JobConsoleLogger.class);
+        context = Mockito.mock(Context.class);
+        Map serverMock = Mockito.mock(Map.class);
+        Mockito.when(serverMock.get("value")).thenReturn(CheckMkStub.server);
+        Mockito.when(config.get(CheckMkTask.CHECK_MK_SERVER)).thenReturn(serverMock);
+
+        Map hostnameMock = Mockito.mock(Map.class);
+        Mockito.when(hostnameMock.get("value")).thenReturn(CheckMkStub.hostName);
+        Mockito.when(config.get(CheckMkTask.HOSTNAME)).thenReturn(hostnameMock);
+
+        Map hostIpMock = Mockito.mock(Map.class);
+        Mockito.when(hostIpMock.get("value")).thenReturn(CheckMkStub.hostIp);
+        Mockito.when(config.get(CheckMkTask.HOST_IP)).thenReturn(hostIpMock);
+
+        Map folderPathMock = Mockito.mock(Map.class);
+        Mockito.when(folderPathMock.get("value")).thenReturn(CheckMkStub.folderPath);
+        Mockito.when(config.get(CheckMkTask.FOLDER_PATH)).thenReturn(folderPathMock);
+
+        Map userNameMock = Mockito.mock(Map.class);
+        Mockito.when(userNameMock.get("value")).thenReturn(CheckMkStub.userName);
+        Mockito.when(config.get(CheckMkTask.USERNAME)).thenReturn(userNameMock);
+
+        Map passwordMock = Mockito.mock(Map.class);
+        Mockito.when(passwordMock.get("value")).thenReturn(CheckMkStub.password);
+        Mockito.when(config.get(CheckMkTask.PASSWORD)).thenReturn(passwordMock);
+    }
+
+    @Test
+    public void Execute_OneRequestFailed_ReturnFalseResult() throws Exception {
+        CheckMkStub.SetupRequestError();
+        EditHostTaskExecutor taskExecutor = new EditHostTaskExecutor(consoleLogger, context, config);
+        taskExecutor.setCheckMkClient(CheckMkStub.checkMkClient);
+        Result result = taskExecutor.execute();
+
+        assertEquals(result.responseCode(), DefaultGoApiResponse.INTERNAL_ERROR);
+    }
+
+    @Test
+    public void Execute_RequestSuccess_ReturnsOkMessage() throws Exception {
+        CheckMkStub.SetupRequestOk();
+        EditHostTaskExecutor taskExecutor = new EditHostTaskExecutor(consoleLogger, context, config);
+        taskExecutor.setCheckMkClient(CheckMkStub.checkMkClient);
+        Result result = taskExecutor.execute();
+
+        assertEquals(result.responseCode(), DefaultGoApiResponse.SUCCESS_RESPONSE_CODE);
+    }
+}
+
diff --git a/check_mk-plugin/test/com/tw/go/task/check_mk/RemoveHostJobTests.java b/check_mk-plugin/test/com/tw/go/task/check_mk/RemoveHostJobTests.java
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/test/com/tw/go/task/check_mk/RemoveHostTaskExecutorTests.java b/check_mk-plugin/test/com/tw/go/task/check_mk/RemoveHostTaskExecutorTests.java
old mode 100644
new mode 100755
diff --git a/check_mk-plugin/test/com/tw/go/task/check_mk/TaskExecutorFactoryTest.java b/check_mk-plugin/test/com/tw/go/task/check_mk/TaskExecutorFactoryTest.java
old mode 100644
new mode 100755
index 662c59b..2e1d333
--- a/check_mk-plugin/test/com/tw/go/task/check_mk/TaskExecutorFactoryTest.java
+++ b/check_mk-plugin/test/com/tw/go/task/check_mk/TaskExecutorFactoryTest.java
@@ -25,36 +25,47 @@ public static void Init() throws Exception {
     }
 
 
-    @Test
-    public void Create_AddAction_ReturnsAddHostObject() throws Exception, JobNotSupportedException {
-        Map actionMock = Mockito.mock(Map.class);
-        Mockito.when(actionMock.get("value")).thenReturn("add");
-        Mockito.when(config.get(CheckMkTask.ACTION)).thenReturn(actionMock);
-
-        CheckMkTaskExecutor taskExecutor= TaskExecutorFactory.Create(consoleLogger,context,config);
-
-        assertEquals(taskExecutor.getClass(),AddHostTaskExecutor.class);
-    }
-
-    @Test
-    public void Create_RemoveAction_ReturnsAddHostObject() throws Exception, JobNotSupportedException {
-        Map actionMock = Mockito.mock(Map.class);
-        Mockito.when(actionMock.get("value")).thenReturn("remove");
-        Mockito.when(config.get(CheckMkTask.ACTION)).thenReturn(actionMock);
-
-        CheckMkTaskExecutor taskExecutor= TaskExecutorFactory.Create(consoleLogger,context,config);
-
-        assertEquals(taskExecutor.getClass(),RemoveHostTaskExecutor.class);
-    }
-
-    @Test(expected = JobNotSupportedException.class)
-    public void Create_WrongAction_Throws() throws Exception, JobNotSupportedException {
-        Map actionMock = Mockito.mock(Map.class);
-        Mockito.when(actionMock.get("value")).thenReturn("test");
-        Mockito.when(config.get(CheckMkTask.ACTION)).thenReturn(actionMock);
-
-        CheckMkTaskExecutor taskExecutor= TaskExecutorFactory.Create(consoleLogger,context,config);
-
-        assertEquals(taskExecutor.getClass(),RemoveHostTaskExecutor.class);
-    }
+//    @Test
+//    public void Create_AddAction_ReturnsAddHostObject() throws Exception, JobNotSupportedException {
+//        Map actionMock = Mockito.mock(Map.class);
+//        Mockito.when(actionMock.get("value")).thenReturn("add");
+//        Mockito.when(config.get(CheckMkTask.ACTION)).thenReturn(actionMock);
+//
+//        CheckMkTaskExecutor taskExecutor= TaskExecutorFactory.Create(consoleLogger,context,config);
+//
+//        assertEquals(taskExecutor.getClass(),AddHostTaskExecutor.class);
+//    }
+//
+//    @Test
+//    public void Create_RemoveAction_ReturnsRemoveHostObject() throws Exception, JobNotSupportedException {
+//        Map actionMock = Mockito.mock(Map.class);
+//        Mockito.when(actionMock.get("value")).thenReturn("remove");
+//        Mockito.when(config.get(CheckMkTask.ACTION)).thenReturn(actionMock);
+//
+//        CheckMkTaskExecutor taskExecutor= TaskExecutorFactory.Create(consoleLogger,context,config);
+//
+//        assertEquals(taskExecutor.getClass(),RemoveHostTaskExecutor.class);
+//    }
+//
+//    @Test
+//    public void Create_EditAction_ReturnsEditHostObject() throws Exception, JobNotSupportedException {
+//        Map actionMock = Mockito.mock(Map.class);
+//        Mockito.when(actionMock.get("value")).thenReturn("edit");
+//        Mockito.when(config.get(CheckMkTask.ACTION)).thenReturn(actionMock);
+//
+//        CheckMkTaskExecutor taskExecutor= TaskExecutorFactory.Create(consoleLogger,context,config);
+//
+//        assertEquals(taskExecutor.getClass(),EditHostTaskExecutor.class);
+//    }
+//
+//    @Test(expected = JobNotSupportedException.class)
+//    public void Create_WrongAction_Throws() throws Exception, JobNotSupportedException {
+//        Map actionMock = Mockito.mock(Map.class);
+//        Mockito.when(actionMock.get("value")).thenReturn("test");
+//        Mockito.when(config.get(CheckMkTask.ACTION)).thenReturn(actionMock);
+//
+//        CheckMkTaskExecutor taskExecutor= TaskExecutorFactory.Create(consoleLogger,context,config);
+//
+//        assertEquals(taskExecutor.getClass(),RemoveHostTaskExecutor.class);
+//    }
 }
diff --git a/docker-compose-plugin/pom.xml b/docker-compose-plugin/pom.xml
new file mode 100644
index 0000000..02de4cc
--- /dev/null
+++ b/docker-compose-plugin/pom.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.thoughtworks.go</groupId>
+    <artifactId>gocd-docker-compose-plugin</artifactId>
+    <version>1.0.0</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <go.target.version>16.4.0</go.target.version>
+        <go.version>16.4.0</go.version>
+        <plugin.version>${project.version}</plugin.version>
+
+        <sonar.java.coveragePlugin>cobertura</sonar.java.coveragePlugin>
+        <sonar.cobertura.reportPath>target/site/cobertura/coverage.xml</sonar.cobertura.reportPath>
+        <sonar.language>java</sonar.language>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>cd.go.plugin</groupId>
+            <artifactId>go-plugin-api</artifactId>
+            <version>${go.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.thoughtworks.go</groupId>
+            <artifactId>gocd-plugin-common</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.10.19</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>1.10.19</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <testSourceDirectory>test</testSourceDirectory>
+        <resources>
+            <resource>
+                <directory>resources</directory>
+            </resource>
+        </resources>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <finalName>${project.artifactId}-${project.version}</finalName>
+                    <outputDirectory>../out</outputDirectory>
+                    <archive>
+                        <manifestEntries>
+                            <Go-Version>${go.version}</Go-Version>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}\lib</outputDirectory>
+                            <includeScope>runtime</includeScope>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>false</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <!-- replaces the version number in plugin.xml -->
+                <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>replacer</artifactId>
+                <version>1.5.3</version>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <file>${project.basedir}/target/classes/plugin.xml</file>
+                    <replacements>
+                        <replacement>
+                            <token>GO_TARGET_VERSION_NUMBER</token>
+                            <value>${go.target.version}</value>
+                        </replacement>
+                        <replacement>
+                            <token>PLUGIN_VERSION_NUMBER</token>
+                            <value>${plugin.version}</value>
+                        </replacement>
+                    </replacements>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/docker-compose-plugin/resources/plugin.xml b/docker-compose-plugin/resources/plugin.xml
new file mode 100644
index 0000000..40aaee8
--- /dev/null
+++ b/docker-compose-plugin/resources/plugin.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<go-plugin id="docker-compose.plugin" version="1">
+    <about>
+        <name>Docker Compose Task Plugin</name>
+        <version>0.1</version>
+        <target-go-version>16.4.0</target-go-version>
+        <description>
+            Task plugin to execute Docker Compose commands.
+            Pre-Release. Use at your own risk.
+        </description>
+        <vendor>
+            <name>Thomas Schuering</name>
+            <url>https://github.com/thomsch98/gocd-plugins</url>
+        </vendor>
+    </about>
+</go-plugin>
diff --git a/docker-compose-plugin/resources/test.properties b/docker-compose-plugin/resources/test.properties
new file mode 100644
index 0000000..e69de29
diff --git a/docker-compose-plugin/resources/views/task.template.html b/docker-compose-plugin/resources/views/task.template.html
new file mode 100644
index 0000000..7daf488
--- /dev/null
+++ b/docker-compose-plugin/resources/views/task.template.html
@@ -0,0 +1,119 @@
+<div class="form_item_block">
+    <h2>Docker Compose</h2>
+    <div class="form_item_block">
+        <label>Logical name of dockerhost<span class="asterisk">*</span></label>
+        <input type="text" ng-model="vmname" ng-required="true">
+        </input>
+    </div>
+    <div class="form_item_block">
+        <label>Service(s) to *explicitly* build</label>
+        <input type="text" ng-model="COMPOSE_BUILD" ng-required="false">
+        </input>
+    </div>
+
+    <!--
+        <div class="form_item_block checkbox_row">
+            <div class="checkbox_label_wrapper">
+                <input name="pipeline[lock]" type="hidden" value="0"/>
+                <input id="pipeline_lock" name="pipeline[lock]"
+                       type="checkbox" value="1"/>
+                <label for="pipeline_lock">Automatic pipeline locking
+                </label>
+            </div>
+            <div class="contextual_help has_go_tip_right"
+                 title="If checked, only a single instance of the pipeline can be run at a time and the lock will release only if the entire pipeline completes successfully. This is particularly useful in deployment scenarios.">
+            </div>
+
+        </div>
+    -->
+
+    <div class="form_item_block">
+        <div class="checkbox_row">
+            <div class="checkbox_label_wrapper">
+                <input id="FORCE_BUILD_ONLY2" type="checkbox" ng-model="FORCE_BUILD_ONLY2"
+                       ng-init="FORCE_BUILD_ONLY2 = FORCE_BUILD_ONLY"
+                       ng-change="FORCE_BUILD_ONLY = FORCE_BUILD_ONLY2" ng-true-value="true" ng-false-value="false"/>
+                <input id="FORCE_BUILD_ONLY" type="hidden" ng-model="FORCE_BUILD_ONLY" value="{{FORCE_BUILD_ONLY}}"/>
+                <label>Do NOT start any services.</label>
+            </div>
+        </div>
+    </div>
+    <div class="form_item_block">
+        <div class="checkbox_row">
+            <input id="FORCE_BUILD2" type="checkbox" ng-model="FORCE_BUILD2" ng-init="FORCE_BUILD2 = FORCE_BUILD"
+                   ng-change="FORCE_BUILD = FORCE_BUILD2" ng-true-value="true" ng-false-value="false">
+            <input id="FORCE_BUILD" type="hidden" ng-model="FORCE_BUILD" value="{{FORCE_BUILD}}">
+            <label>Force a 'build', even if *local* resources/files are NOT modified.</label>
+        </div>
+    </div>
+    <div class="form_item_block">
+        <div class="checkbox_row">
+            <input id="COMPOSE_NO_CACHE2" type="checkbox" ng-model="COMPOSE_NO_CACHE2"
+                   ng-init="COMPOSE_NO_CACHE2 = COMPOSE_NO_CACHE"
+                   ng-change="COMPOSE_NO_CACHE = COMPOSE_NO_CACHE2" ng-true-value="true" ng-false-value="false">
+            <input id="COMPOSE_NO_CACHE" type="hidden" ng-model="COMPOSE_NO_CACHE" value="{{COMPOSE_NO_CACHE}}">
+            <label>Force a 'build' WITHOUT using already cached layers.</label>
+        </div>
+    </div>
+    <div class="form_item_block">
+        <div class="checkbox_row">
+            <input id="COMPOSE_REMOVE_VOLUMES2" type="checkbox" ng-model="COMPOSE_REMOVE_VOLUMES2"
+                   ng-init="COMPOSE_REMOVE_VOLUMES2 = COMPOSE_REMOVE_VOLUMES"
+                   ng-change="COMPOSE_REMOVE_VOLUMES = COMPOSE_REMOVE_VOLUMES2" ng-true-value="true"
+                   ng-false-value="false">
+            <input id="COMPOSE_REMOVE_VOLUMES" type="hidden" ng-model="COMPOSE_REMOVE_VOLUMES"
+                   value="{{COMPOSE_REMOVE_VOLUMES}}">
+            <label>Remove volumes associated with containers.</label>
+        </div>
+    </div>
+    <div class="form_item_block">
+        <div class="checkbox_row">
+            <input id="COMPOSE_DOWN2" type="checkbox" ng-model="COMPOSE_DOWN2"
+                   ng-init="COMPOSE_DOWN2 = COMPOSE_DOWN"
+                   ng-change="COMPOSE_DOWN = COMPOSE_DOWN2" ng-true-value="true"
+                   ng-false-value="false">
+            <input id="COMPOSE_DOWN" type="hidden" ng-model="COMPOSE_DOWN"
+                   value="{{COMPOSE_DOWN}}">
+            <label>Issue a "compose down" command</label>
+        </div>
+    </div>
+    <div class="form_item_block">
+        <div class="checkbox_row">
+            <input id="FORCE_PULL2" type="checkbox" ng-model="FORCE_PULL2" ng-init="FORCE_PULL2 = FORCE_PULL"
+                   ng-change="FORCE_PULL = FORCE_PULL2" ng-true-value="true" ng-false-value="false">
+            <input id="FORCE_PULL" type="hidden" ng-model="FORCE_PULL" value="{{FORCE_PULL}}">
+            <label>Update images used in the docker-compose file.</label>
+        </div>
+    </div>
+    <div class="form_item_block">
+        <label>Service(s) to start</label>
+        <input type="text" ng-model="service" ng-required="false">
+        </input>
+    </div>
+    <div class="form_item_block">
+        <label>Name of *.yml file (if empty, docker-compose.yml)</label>
+        <input type="text" ng-model="COMPOSE_FILE" ng-required="false">
+        </input>
+    </div>
+    <div class="form_item_block">
+        <label>Task specific environment variables (name=value[;name=value])</label>
+        <input type="text" ng-model="ENV_VARS" ng-required="false">
+        </input>
+    </div>
+    <div class="form_item_block">
+        <div class="checkbox_row">
+            <input id="FORCE_RECREATE2" type="checkbox" ng-model="FORCE_RECREATE2"
+                   ng-init="FORCE_RECREATE2 = FORCE_RECREATE"
+                   ng-change="FORCE_RECREATE = FORCE_RECREATE2" ng-true-value="true" ng-false-value="false">
+            <input id="FORCE_RECREATE" type="hidden" ng-model="FORCE_RECREATE" value="{{FORCE_RECREATE}}">
+            <label>Force recreation of containers (e.g. For restarting init)</label>
+        </div>
+    </div>
+<!--
+    <div class="form_item_block">
+        <label>Create an deployment bundle (*.dab)</label>
+        <input type="text" ng-model="BUNDLE_OUTPUT_PATH" ng-required="false">
+        </input>
+    </div>
+-->
+</div>
diff --git a/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeBuildCommand.java b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeBuildCommand.java
new file mode 100755
index 0000000..5710d4a
--- /dev/null
+++ b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeBuildCommand.java
@@ -0,0 +1,23 @@
+package com.tw.go.task.dockercompose;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.ConfigVars;
+
+import java.io.FileNotFoundException;
+
+/**
+ * Created by thomassc on 08.05.16.
+ */
+public class DockerComposeBuildCommand extends DockerComposeCommand {
+
+    public DockerComposeBuildCommand(JobConsoleLogger console, ConfigVars configVars) throws FileNotFoundException {
+        super(console,configVars);
+
+        add("build");
+        if (configVars.isChecked(DockerComposeTask.COMPOSE_NO_CACHE)) {
+            add("--no-cache");
+        }
+
+        addServiceList(configVars);
+    }
+}
diff --git a/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeBundleCommand.java b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeBundleCommand.java
new file mode 100644
index 0000000..2729e0d
--- /dev/null
+++ b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeBundleCommand.java
@@ -0,0 +1,24 @@
+package com.tw.go.task.dockercompose;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.ConfigVars;
+
+import java.io.FileNotFoundException;
+
+/**
+ * Created by thomassc on 08.05.16.
+ */
+public class DockerComposeBundleCommand extends DockerComposeCommand {
+
+    public DockerComposeBundleCommand(JobConsoleLogger console, ConfigVars configVars) throws Exception {
+        super(console, configVars);
+
+        if (configVars.isEmpty(DockerComposeTask.BUNDLE_OUTPUT_PATH)) {
+            throw new Exception("Missing setting for " + DockerComposeTask.BUNDLE_OUTPUT_PATH);
+        }
+
+        add("bundle");
+        add("--output");
+        add(configVars.getValue(DockerComposeTask.BUNDLE_OUTPUT_PATH));
+    }
+}
diff --git a/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeCommand.java b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeCommand.java
new file mode 100755
index 0000000..6ad1ca2
--- /dev/null
+++ b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeCommand.java
@@ -0,0 +1,107 @@
+package com.tw.go.task.dockercompose;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.thoughtworks.go.plugin.api.logging.Logger;
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.AbstractCommand;
+import com.tw.go.plugin.common.ConfigVars;
+import com.tw.go.plugin.common.Selector;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by thomassc on 27.05.16.
+ */
+public class DockerComposeCommand extends AbstractCommand {
+
+    public static final int DOCKER_PORT = 2376;
+    protected Gson gson = new GsonBuilder().serializeNulls().create();
+    private final static Logger logger = Logger.getLoggerFor(DockerComposeCommand.class);
+
+    public DockerComposeCommand(JobConsoleLogger console, ConfigVars configVars) throws FileNotFoundException {
+        super(console);
+
+        // 1. just copy from the current environment
+        addEnv(configVars.environmentVars());
+
+        // 2. variables stated/defined explicitly
+        addEnv(splitKeyValues(configVars.getValue(DockerComposeTask.ENV_VARS)));
+
+        // 3. variables defined by the configuration settings
+        addEnvFromConfig(configVars, DockerComposeTask.COMPOSE_FILE);
+
+        // 4. variables based on the docker-machine environment settings
+        addEnv(getDockerMachineEnv(configVars.getValue(DockerComposeTask.VMNAME)));
+
+        add("docker-compose");
+    }
+
+    protected void addServiceList(ConfigVars configVars) {
+
+        if (!configVars.getValue(DockerComposeTask.SERVICE).isEmpty()) {
+            for (String svc : configVars.getValue(DockerComposeTask.SERVICE).split("[,; ]")) {
+                add(svc);
+            }
+        }
+    }
+
+    public Map getDockerMachineEnv(String vmname) throws FileNotFoundException {
+        String unifiedVmName = unifyMachineName(vmname);
+        Selector machines = new Selector(getDockerMachines(gson, getAbsoluteWorkingDir() + "/.docker/machine"));
+        if (!machines.getMap().containsKey(unifiedVmName)) {
+            throw new IllegalArgumentException("trying to use docker-compose with unknown machine");
+        }
+
+        String configPath = ".docker/machine/machines/" + vmname;
+
+        int port = machines.select(unifiedVmName + ".Driver.EnginePort", DOCKER_PORT);
+
+        Map dme = new HashMap<>();
+
+        dme.put("DOCKER_TLS_VERIFY", "1");
+        dme.put("DOCKER_HOST", "tcp://" + machines.select(unifiedVmName + ".Driver.IPAddress") + ":" + port);
+        dme.put("DOCKER_CERT_PATH", configPath);
+        dme.put("DOCKER_MACHINE_NAME", "" + machines.select(unifiedVmName + ".Driver.MachineName"));
+        dme.put("DM_HOST_IP", machines.select(unifiedVmName + ".Driver.IPAddress"));
+
+        for (String name : ((Map<String, Object>) machines.getMap()).keySet()) {
+            dme.put("DM_" + name.toUpperCase() + "_IP", machines.select(name + ".Driver.IPAddress"));
+        }
+
+        for (String key : ((Map<String, Object>) dme).keySet()) {
+            console.printLine(String.format("setting extracted environment variable '%s' to value '%s'", key, dme.get(key)));
+        }
+
+        return dme;
+    }
+
+    static Map getDockerMachines(Gson gson, String storagePath) throws FileNotFoundException {
+        Map map = new HashMap<>();
+        File[] dirs = new File(storagePath + "/machines").listFiles(new FileFilter() {
+            @Override
+            public boolean accept(File file) {
+                return file.isDirectory();
+            }
+        });
+        if (dirs != null) {
+            for (File dir : dirs) {
+                Map config = (Map) gson.fromJson(new FileReader(dir.getAbsolutePath() + "/config.json"), Object.class);
+                map.put(unifyMachineName(dir.getName()), config);
+            }
+        } else {
+            logger.info("No (machine) directories found under '" + storagePath + "/machines'");
+        }
+        return map;
+    }
+
+    static String unifyMachineName(String name) {
+        return name.replaceAll("[.-]", "_");
+    }
+
+}
\ No newline at end of file
diff --git a/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeDownCommand.java b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeDownCommand.java
new file mode 100644
index 0000000..10b30ea
--- /dev/null
+++ b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeDownCommand.java
@@ -0,0 +1,25 @@
+package com.tw.go.task.dockercompose;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.ConfigVars;
+
+import java.io.FileNotFoundException;
+
+/**
+ * Created by thomassc on 08.05.16.
+ */
+public class DockerComposeDownCommand extends DockerComposeCommand {
+
+    public DockerComposeDownCommand(JobConsoleLogger console, ConfigVars configVars) throws FileNotFoundException {
+        super(console,configVars);
+
+        add("down");
+        add("--remove-orphans");
+
+        if (configVars.isChecked(DockerComposeTask.COMPOSE_REMOVE_VOLUMES)) {
+            add("-v");
+        }
+
+        //addServiceList(configVars);
+    }
+}
diff --git a/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposePsCommand.java b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposePsCommand.java
new file mode 100644
index 0000000..9e3ee12
--- /dev/null
+++ b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposePsCommand.java
@@ -0,0 +1,20 @@
+package com.tw.go.task.dockercompose;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.ConfigVars;
+
+import java.io.FileNotFoundException;
+
+/**
+ * Created by thomassc on 08.05.16.
+ */
+public class DockerComposePsCommand extends DockerComposeCommand {
+
+    public DockerComposePsCommand(JobConsoleLogger console, ConfigVars configVars) throws FileNotFoundException {
+        super(console,configVars);
+
+        add("ps");
+
+        addServiceList(configVars);
+    }
+}
diff --git a/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposePullCommand.java b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposePullCommand.java
new file mode 100755
index 0000000..86803f2
--- /dev/null
+++ b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposePullCommand.java
@@ -0,0 +1,30 @@
+package com.tw.go.task.dockercompose;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.AbstractCommand;
+import com.tw.go.plugin.common.ConfigVars;
+import com.tw.go.plugin.common.Selector;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by thomassc on 08.05.16.
+ */
+public class DockerComposePullCommand extends DockerComposeCommand {
+
+    public DockerComposePullCommand(JobConsoleLogger console, ConfigVars configVars) throws FileNotFoundException {
+        super(console,configVars);
+
+        add("pull");
+        add("--ignore-pull-failures");
+
+        addServiceList(configVars);
+    }
+}
diff --git a/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeRmCommand.java b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeRmCommand.java
new file mode 100755
index 0000000..b9c9901
--- /dev/null
+++ b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeRmCommand.java
@@ -0,0 +1,25 @@
+package com.tw.go.task.dockercompose;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.ConfigVars;
+
+import java.io.FileNotFoundException;
+
+/**
+ * Created by thomassc on 08.05.16.
+ */
+public class DockerComposeRmCommand extends DockerComposeCommand {
+
+    public DockerComposeRmCommand(JobConsoleLogger console, ConfigVars configVars) throws FileNotFoundException {
+        super(console,configVars);
+
+        add("rm");
+        add("-f");
+
+        if (configVars.isChecked(DockerComposeTask.COMPOSE_REMOVE_VOLUMES)) {
+            add("-v");
+        }
+
+        addServiceList(configVars);
+    }
+}
diff --git a/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeStopCommand.java b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeStopCommand.java
new file mode 100755
index 0000000..832c945
--- /dev/null
+++ b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeStopCommand.java
@@ -0,0 +1,20 @@
+package com.tw.go.task.dockercompose;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.ConfigVars;
+
+import java.io.FileNotFoundException;
+
+/**
+ * Created by thomassc on 08.05.16.
+ */
+public class DockerComposeStopCommand extends DockerComposeCommand {
+
+    public DockerComposeStopCommand(JobConsoleLogger console, ConfigVars configVars) throws FileNotFoundException {
+        super(console,configVars);
+
+        add("stop");
+
+        addServiceList(configVars);
+    }
+}
diff --git a/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeTask.java b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeTask.java
new file mode 100644
index 0000000..a39edcf
--- /dev/null
+++ b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeTask.java
@@ -0,0 +1,77 @@
+package com.tw.go.task.dockercompose;
+
+import com.google.gson.GsonBuilder;
+import com.thoughtworks.go.plugin.api.GoPluginIdentifier;
+import com.thoughtworks.go.plugin.api.annotation.Extension;
+import com.thoughtworks.go.plugin.api.request.GoPluginApiRequest;
+import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
+import com.tw.go.plugin.common.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+@Extension
+public class DockerComposeTask extends BaseGoPlugin {
+
+    public static final String VMNAME = "vmname";
+    public static final String SERVICE = "service";
+    public static final String COMPOSE_BUILD = "COMPOSE_BUILD";
+    public static final String COMPOSE_FILE = "COMPOSE_FILE";
+    public static final String ENV_VARS = "ENV_VARS";
+    public static final String FORCE_RECREATE = "FORCE_RECREATE";
+    public static final String FORCE_BUILD = "FORCE_BUILD";
+    public static final String COMPOSE_NO_CACHE = "COMPOSE_NO_CACHE";
+    public static final String COMPOSE_REMOVE_VOLUMES = "COMPOSE_REMOVE_VOLUMES";
+    public static final String COMPOSE_DOWN = "COMPOSE_DOWN";
+    public static final String FORCE_PULL = "FORCE_PULL";
+    public static final String FORCE_BUILD_ONLY = "FORCE_BUILD_ONLY";
+    public static final String BUNDLE_OUTPUT_PATH = "BUNDLE_OUTPUT_PATH";
+
+    @Override
+    protected GoPluginApiResponse handleGetConfigRequest(GoPluginApiRequest request) {
+        return success(new ConfigDef()
+                .add(VMNAME, "", Required.YES)
+                .add(SERVICE, "", Required.NO)
+                .add(ENV_VARS, "", Required.NO)
+                .add(COMPOSE_BUILD, "", Required.NO)
+                .add(COMPOSE_FILE, "", Required.NO)
+                .add(FORCE_RECREATE, "false", Required.NO)
+                .add(FORCE_BUILD, "false", Required.NO)
+                .add(COMPOSE_NO_CACHE, "false", Required.NO)
+                .add(COMPOSE_REMOVE_VOLUMES, "false", Required.NO)
+                .add(COMPOSE_DOWN, "false", Required.NO)
+                .add(FORCE_PULL, "false", Required.NO)
+                .add(FORCE_BUILD_ONLY, "false", Required.NO)
+                .add(BUNDLE_OUTPUT_PATH, "", Required.NO)
+                .toMap());
+    }
+
+    @Override
+    protected GoPluginApiResponse handleValidation(GoPluginApiRequest request) {
+        return success(new HashMap<String, String>());
+    }
+
+    @Override
+    protected GoPluginApiResponse handleTaskExecution(GoPluginApiRequest request) throws Exception {
+        Map executionRequest = (Map) new GsonBuilder().create().fromJson(request.requestBody(), Object.class);
+
+        Map<String, Map> config = (Map) executionRequest.get("config");
+
+        Context context = new Context((Map) executionRequest.get("context"));
+
+        TaskExecutor executor = new DockerComposeTaskExecutor(MaskingJobConsoleLogger.getConsoleLogger(), context, config);
+        return success(executor.execute());
+    }
+
+    @Override
+    protected GoPluginApiResponse handleTaskView(GoPluginApiRequest request) {
+        return getViewResponse("Docker Compose",
+                getClass().getResourceAsStream("/views/task.template.html"));
+    }
+
+    @Override
+    public GoPluginIdentifier pluginIdentifier() {
+        return new GoPluginIdentifier("task", Arrays.asList("1.0"));
+    }
+}
\ No newline at end of file
diff --git a/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeTaskExecutor.java b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeTaskExecutor.java
new file mode 100644
index 0000000..f0d06a3
--- /dev/null
+++ b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeTaskExecutor.java
@@ -0,0 +1,68 @@
+package com.tw.go.task.dockercompose;
+
+import com.thoughtworks.go.plugin.api.logging.Logger;
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.Context;
+import com.tw.go.plugin.common.Result;
+import com.tw.go.plugin.common.TaskExecutor;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+public class DockerComposeTaskExecutor extends TaskExecutor {
+    private final Logger logger = Logger.getLoggerFor(DockerComposeTaskExecutor.class);
+
+    public DockerComposeTaskExecutor(JobConsoleLogger console, Context context, Map config) {
+        super(console, context, config);
+    }
+
+    @Override
+    protected String getPluginLogPrefix() {
+        return "[Docker Compose] ";
+    }
+
+    // String pipelineName, String pipelineCounter, String stageName, String stageCounter, String jobName, String propertyName, String propertyValue
+
+    @Override
+    public Result execute() throws Exception {
+        try {
+            if (configVars.isChecked(DockerComposeTask.COMPOSE_DOWN)) {
+                new DockerComposeDownCommand(console, configVars)
+                        .run();
+            }
+            if (configVars.isChecked(DockerComposeTask.COMPOSE_REMOVE_VOLUMES)) {
+                new DockerComposePsCommand(console, configVars)
+                        .run();
+                new DockerComposeStopCommand(console, configVars)
+                        .run();
+                new DockerComposeRmCommand(console, configVars)
+                        .run();
+            }
+            if (configVars.isChecked(DockerComposeTask.FORCE_PULL)) {
+                new DockerComposePullCommand(console, configVars)
+                        .run();
+            }
+            if (configVars.isChecked(DockerComposeTask.FORCE_BUILD)) {
+                new DockerComposeBuildCommand(console, configVars)
+                        .run();
+            }
+            if (!configVars.isEmpty(DockerComposeTask.BUNDLE_OUTPUT_PATH)) {
+                new DockerComposeBundleCommand(console, configVars)
+                        .run();
+            }
+            if (!configVars.isChecked(DockerComposeTask.FORCE_BUILD_ONLY)) {
+                new DockerComposeUpCommand(console, configVars)
+                        .run();
+                new DockerComposePsCommand(console, configVars)
+                        .run();
+            }
+        } catch (Exception e) {
+            logException(logger, e);
+            return new Result(false, getPluginLogPrefix() + e.getMessage(), e);
+        }
+
+        return new Result(true, "Finished");
+    }
+}
\ No newline at end of file
diff --git a/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeUpCommand.java b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeUpCommand.java
new file mode 100755
index 0000000..df081c2
--- /dev/null
+++ b/docker-compose-plugin/src/com/tw/go/task/dockercompose/DockerComposeUpCommand.java
@@ -0,0 +1,35 @@
+package com.tw.go.task.dockercompose;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.AbstractCommand;
+import com.tw.go.plugin.common.ConfigVars;
+import com.tw.go.plugin.common.Selector;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by thomassc on 08.05.16.
+ */
+public class DockerComposeUpCommand extends DockerComposeCommand {
+
+    public DockerComposeUpCommand(JobConsoleLogger console, ConfigVars configVars) throws FileNotFoundException {
+        super(console, configVars);
+
+        add("up");
+        add("-d");
+        add("--remove-orphans");
+
+        if (configVars.isChecked(DockerComposeTask.FORCE_RECREATE)) {
+            add("--force-recreate");
+        }
+
+        addServiceList(configVars);
+    }
+}
diff --git a/docker-machine-plugin/pom.xml b/docker-machine-plugin/pom.xml
new file mode 100644
index 0000000..83075d5
--- /dev/null
+++ b/docker-machine-plugin/pom.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.thoughtworks.go</groupId>
+    <artifactId>gocd-docker-machine-plugin</artifactId>
+    <version>1.0.0</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <go.target.version>16.4.0</go.target.version>
+        <go.version>16.4.0</go.version>
+        <plugin.version>${project.version}</plugin.version>
+
+        <sonar.java.coveragePlugin>cobertura</sonar.java.coveragePlugin>
+        <sonar.cobertura.reportPath>target/site/cobertura/coverage.xml</sonar.cobertura.reportPath>
+        <sonar.language>java</sonar.language>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>cd.go.plugin</groupId>
+            <artifactId>go-plugin-api</artifactId>
+            <version>${go.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.thoughtworks.go</groupId>
+            <artifactId>gocd-plugin-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.10.19</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>1.10.19</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <testSourceDirectory>test</testSourceDirectory>
+        <resources>
+            <resource>
+                <directory>resources</directory>
+            </resource>
+        </resources>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <finalName>${project.artifactId}-${project.version}</finalName>
+                    <outputDirectory>../out</outputDirectory>
+                    <archive>
+                        <manifestEntries>
+                            <Go-Version>${go.version}</Go-Version>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}\lib</outputDirectory>
+                            <includeScope>runtime</includeScope>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>false</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <!-- replaces the version number in plugin.xml -->
+                <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>replacer</artifactId>
+                <version>1.5.3</version>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <file>${project.basedir}/target/classes/plugin.xml</file>
+                    <replacements>
+                        <replacement>
+                            <token>GO_TARGET_VERSION_NUMBER</token>
+                            <value>${go.target.version}</value>
+                        </replacement>
+                        <replacement>
+                            <token>PLUGIN_VERSION_NUMBER</token>
+                            <value>${plugin.version}</value>
+                        </replacement>
+                    </replacements>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/docker-machine-plugin/resources/plugin.xml b/docker-machine-plugin/resources/plugin.xml
new file mode 100644
index 0000000..af748cc
--- /dev/null
+++ b/docker-machine-plugin/resources/plugin.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<go-plugin id="docker-machine.plugin" version="1">
+    <about>
+        <name>Docker Machine Task Plugin</name>
+        <version>0.1</version>
+        <target-go-version>16.4.0</target-go-version>
+        <description>
+            Task plugin to execute Docker Machine commands.
+            Pre-Release. Use at your own risk.
+        </description>
+        <vendor>
+            <name>Thomas Schuering</name>
+            <url>https://github.com/thomsch98/gocd-plugins</url>
+        </vendor>
+    </about>
+</go-plugin>
diff --git a/docker-machine-plugin/resources/test.properties b/docker-machine-plugin/resources/test.properties
new file mode 100644
index 0000000..e69de29
diff --git a/docker-machine-plugin/resources/views/task.template.html b/docker-machine-plugin/resources/views/task.template.html
new file mode 100644
index 0000000..6411b89
--- /dev/null
+++ b/docker-machine-plugin/resources/views/task.template.html
@@ -0,0 +1,176 @@
+<a href="https://docs.docker.com/machine/reference/create/">Docker create documentation</a>
+<br>
+<div class="form_item_block">
+    <div class="form_item_block">
+        <label>Name(s) of the virtual machine(s). Format is text[format,start,stop,step]text. You can enter multiple names, separated with a semicolon. <span class="asterisk">*</span></label>
+        <input type="text" ng-model="VMNAME" ng-required="true">
+        </input>
+    </div>
+</div>
+<div class="form_item_block">
+    <input id="REMOVE2" type="checkbox" ng-model="REMOVE2" ng-init="REMOVE2 = REMOVE"
+           ng-change="REMOVE = REMOVE2" ng-true-value="true" ng-false-value="false">
+    <input id="specifytargets" type="hidden" ng-model="REMOVE" value="{{REMOVE}}">
+    <label>Remove machine and/or configuration before creating a new one</label>
+</div>
+<div class="form_item_block">
+    <label>Specify environment variables to set in the engine</label>
+    <input type="text" ng-model="ENGINE_ENV" ng-required="false">
+    </input>
+</div>
+<div class="form_item_block">
+    <label>Specify arbitrary daemon options with the syntax name=value. Multiple pairs can be provided separated by ','</label>
+    <input type="text" ng-model="ENGINE_OPT" ng-required="false">
+    </input>
+</div>
+<div class="form_item_block">
+    <H2>Driver used by create</H2>
+    <select ng-model="DRIVER">
+        <option value="undefined">-- undefined --</option>
+        <option value="generic">generic</option>
+        <option value="vmwarevsphere">vmwarevsphere</option>
+        <option value="azure">azure</option>
+    </select>
+</div>
+<div class="form_item_block">
+    <div class="driver_generic" ng-show="DRIVER=='generic'">
+        <H2>Generic Driver</H2>
+        <div class="form_item_block">
+            <label>Path to the SSH user private key (must be accessible from go-agent!)</label>
+            <input type="text" ng-model="GENERIC_SSH_KEY">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>SSH username used to connect</label>
+            <input type="text" ng-model="GENERIC_SSH_USER">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>IP Address of host</label>
+            <input type="text" ng-model="GENERIC_IP_ADDRESS">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>Port to use for SSH</label>
+            <input type="text" ng-model="GENERIC_SSH_PORT">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>Port to use for Docker Daemon (Note: This flag will not work with boot2docker).</label>
+            <input type="text" ng-model="GENERIC_ENGINE_PORT">
+            </input>
+        </div>
+    </div>
+</div>
+<div class="form_item_block">
+    <div class="driver_vsphere" ng-show="DRIVER=='vmwarevsphere'">
+        <H2>VMWare VSphere Driver</H2>
+        <div class="form_item_block">
+            <label>Username</label>
+            <input type="text" ng-model="VSPHERE_USERNAME">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>Password</label>
+            <input type="password" ng-model="VSPHERE_PASSWORD">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>IP/hostname for vCenter or ESXi</label>
+            <input type="text" ng-model="VSPHERE_VCENTER">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>DataCenter (for ESXi use ha-datacenter)</label>
+            <input type="text" ng-model="VSPHERE_DATACENTER">
+            </input>
+        </div>
+
+        <div class="form_item_block">
+            <label>CPU count</label>
+            <input type="text" ng-model="VSPHERE_CPU_COUNT">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>Memory size</label>
+            <input type="text" ng-model="VSPHERE_MEMORY_SIZE">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>Disk size</label>
+            <input type="text" ng-model="VSPHERE_DISK_SIZE">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>URL of BootImage</label>
+            <input type="text" ng-model="VSPHERE_BOOT2DOCKER_URL">
+            </input>
+        </div>
+    </div>
+</div>
+<div class="form_item_block">
+    <div class="driver_generic" ng-show="DRIVER=='azure'">
+        <H2>Azure Driver</H2>
+        <div class="form_item_block">
+            <label>Your Azure Subscription ID</label>
+            <input type="text" ng-model="AZURE_SUBSCRIPTION_ID">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>Azure environment (e.g. AzurePublicCloud, AzureChinaCloud)</label>
+            <input type="text" ng-model="AZURE_ENVIRONMENT">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>Azure virtual machine image in the format of Publisher:Offer:Sku:Version</label>
+            <input type="text" ng-model="AZURE_IMAGE">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>Azure region to create the virtual machine</label>
+            <input type="text" ng-model="AZURE_LOCATION">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>Azure Resource Group name to create the resources in.</label>
+            <input type="text" ng-model="AZURE_RESOURCE_GROUP">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>Size for Azure Virtual Machine</label>
+            <input type="text" ng-model="AZURE_SIZE">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>Username for SSH login</label>
+            <input type="text" ng-model="AZURE_SSH_USER">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>Azure Virtual Network name to connect the virtual machine</label>
+            <input type="text" ng-model="AZURE_VNET">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>Azure Subnet Name to be used within the Virtual Network.</label>
+            <input type="text" ng-model="AZURE_SUBNET">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>Private CIDR block. Used to create subnet if it does not exist. Must match in the case that the
+                subnet does exist.</label>
+            <input type="text" ng-model="AZURE_SUBNET_PREFIX">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>Azure Availability Set to place the virtual machine into</label>
+            <input type="text" ng-model="AZURE_AVAILABILITY_SET">
+            </input>
+        </div>
+        <div class="form_item_block">
+            <label>Port number for Docker engine </label>
+            <input type="text" ng-model="AZURE_DOCKER_PORT">
+            </input>
+        </div>
+    </div>
+</div>
diff --git a/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineCommand.java b/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineCommand.java
new file mode 100755
index 0000000..ff114a6
--- /dev/null
+++ b/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineCommand.java
@@ -0,0 +1,57 @@
+package com.tw.go.task.dockercompose;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.AbstractCommand;
+import com.tw.go.plugin.common.ProcessRunner;
+
+import java.io.File;
+import java.io.FileFilter;
+
+import static com.tw.go.task.dockercompose.DockerMachineTask.MACHINE_STORAGE_PATH;
+
+/**
+ * Created by thomassc on 24.05.16.
+ */
+public class DockerMachineCommand extends AbstractCommand {
+
+    public DockerMachineCommand(JobConsoleLogger logger) {
+        this(logger, new ProcessRunner(), false);
+    }
+
+    public DockerMachineCommand(JobConsoleLogger logger, boolean ignoreErrors) {
+        this(logger, new ProcessRunner(), ignoreErrors);
+    }
+
+    public DockerMachineCommand(JobConsoleLogger logger, ProcessRunner processRunner, boolean ignoreErrors) {
+        super(logger, processRunner, ignoreErrors);
+
+        String storagePath = ".docker/machine";
+        addEnv(MACHINE_STORAGE_PATH, storagePath);
+
+        fixPrivatKeyPermissions(storagePath);
+    }
+
+    public void fixPrivatKeyPermissions(String storagePath) {
+        String machinesDir = getAbsoluteWorkingDir() + "/" + storagePath + "/machines";
+
+        try {
+            File[] dirs = new File(machinesDir).listFiles(new FileFilter() {
+                @Override
+                public boolean accept(File file) {
+                    return file.isDirectory();
+                }
+            });
+
+            for (File dir : dirs) {
+                File file = new File(dir.getAbsolutePath() + "/id_rsa");
+                file.setExecutable(false, false);
+                file.setWritable(false, false);
+                file.setReadable(false, false);
+                file.setWritable(true, true);
+                file.setReadable(true, true);
+            }
+        } catch (Exception e) {
+            // do we really want to suppress everything???
+        }
+    }
+}
diff --git a/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineCreateCommand.java b/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineCreateCommand.java
new file mode 100755
index 0000000..58f9d35
--- /dev/null
+++ b/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineCreateCommand.java
@@ -0,0 +1,76 @@
+package com.tw.go.task.dockercompose;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.AbstractCommand;
+import com.tw.go.plugin.common.ConfigVars;
+import com.tw.go.plugin.common.ListUtil;
+
+import static com.tw.go.plugin.common.GoApiConstants.*;
+import static com.tw.go.task.dockercompose.DockerMachineTask.*;
+
+/**
+ * Created by thomassc on 08.05.16.
+ */
+public class DockerMachineCreateCommand extends DockerMachineCommand {
+    public DockerMachineCreateCommand(JobConsoleLogger console, ConfigVars configVars) {
+        super(console);
+
+        addEnv(configVars.environmentVars());
+
+        add("docker-machine");
+        add("create");
+
+        for (String opt : ListUtil.splitByFirstOrDefault(configVars.getValue(ENGINE_OPT),';')) {
+            add("--engine-opt");
+            add(opt);
+        }
+
+        for (String env : ListUtil.splitByFirstOrDefault(configVars.getValue(ENGINE_ENV),';')) {
+            add("--engine-env");
+            add(env);
+        }
+
+        add("--driver");
+
+        switch(configVars.getValue(DRIVER)) {
+            case "generic":
+                add("generic");
+                addEnvFromConfig(configVars, GENERIC_SSH_USER);
+                addEnvFromConfig(configVars, GENERIC_SSH_KEY);
+                addEnvFromConfig(configVars, GENERIC_IP_ADDRESS);
+                addEnvFromConfig(configVars, GENERIC_ENGINE_PORT);
+                addEnvFromConfig(configVars, GENERIC_IP_ADDRESS);
+                break;
+            case "azure":
+                add("azure");
+                addEnvFromConfig(configVars, AZURE_SUBSCRIPTION_ID);
+                addEnvFromConfig(configVars, AZURE_ENVIRONMENT);
+                addEnvFromConfig(configVars, AZURE_IMAGE);
+                addEnvFromConfig(configVars, AZURE_LOCATION);
+                addEnvFromConfig(configVars, AZURE_RESOURCE_GROUP);
+                addEnvFromConfig(configVars, AZURE_SIZE);
+                addEnvFromConfig(configVars, AZURE_SSH_USER);
+                addEnvFromConfig(configVars, AZURE_VNET);
+                addEnvFromConfig(configVars, AZURE_SUBNET);
+                addEnvFromConfig(configVars, AZURE_SUBNET_PREFIX);
+                addEnvFromConfig(configVars, AZURE_AVAILABILITY_SET);
+                addEnvFromConfig(configVars, AZURE_DOCKER_PORT);
+                break;
+            case "vmwarevsphere":
+                add("vmwarevsphere");
+                addEnvFromConfig(configVars, VSPHERE_USERNAME);
+                addEnvFromConfig(configVars, VSPHERE_PASSWORD);
+                addEnvFromConfig(configVars, VSPHERE_VCENTER);
+                addEnvFromConfig(configVars, VSPHERE_DATACENTER);
+                addEnvFromConfig(configVars, VSPHERE_CPU_COUNT);
+                addEnvFromConfig(configVars, VSPHERE_MEMORY_SIZE);
+                addEnvFromConfig(configVars, VSPHERE_DISK_SIZE);
+                addEnvFromConfig(configVars, VSPHERE_BOOT2DOCKER_URL);
+                break;
+            default:
+                throw new IllegalArgumentException("Unsupported driver");
+        }
+
+        add(configVars.getValue(VMNAME));
+    }
+}
diff --git a/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineListCommand.java b/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineListCommand.java
new file mode 100755
index 0000000..8e6edd9
--- /dev/null
+++ b/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineListCommand.java
@@ -0,0 +1,37 @@
+package com.tw.go.task.dockercompose;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.AbstractCommand;
+import com.tw.go.plugin.common.ConfigVars;
+
+import static com.tw.go.plugin.common.GoApiConstants.ENVVAR_NAME_GO_PIPELINE_NAME;
+import static com.tw.go.task.dockercompose.DockerMachineTask.MACHINE_STORAGE_PATH;
+
+/**
+ * Created by thomassc on 08.05.16.
+ */
+public class DockerMachineListCommand extends DockerMachineCommand {
+    public static final boolean QUIET_MODE_ON = true;
+    public static final boolean QUIET_MODE_OFF = false;
+
+    public DockerMachineListCommand(JobConsoleLogger console, ConfigVars configVars) {
+        this(console, configVars, QUIET_MODE_OFF, null, null);
+    }
+
+    public DockerMachineListCommand(JobConsoleLogger console, ConfigVars configVars, boolean quiet, String filter, String format) {
+        super(console, true);
+        add("docker-machine");
+        add("ls");
+        if (quiet) {
+            add("--quiet");
+        }
+        if (filter != null) {
+            add("--filter");
+            add(filter);
+        }
+        if (format != null) {
+            add("--format");
+            add(format);
+        }
+    }
+}
diff --git a/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineRemoveCommand.java b/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineRemoveCommand.java
new file mode 100755
index 0000000..1d9d365
--- /dev/null
+++ b/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineRemoveCommand.java
@@ -0,0 +1,43 @@
+package com.tw.go.task.dockercompose;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.AbstractCommand;
+import com.tw.go.plugin.common.ConfigVars;
+
+import static com.tw.go.plugin.common.GoApiConstants.ENVVAR_NAME_GO_PIPELINE_NAME;
+import static com.tw.go.task.dockercompose.DockerMachineListCommand.QUIET_MODE_ON;
+import static com.tw.go.task.dockercompose.DockerMachineTask.MACHINE_STORAGE_PATH;
+
+/**
+ * Created by thomassc on 08.05.16.
+ */
+public class DockerMachineRemoveCommand extends DockerMachineCommand {
+
+    public DockerMachineRemoveCommand(JobConsoleLogger console, ConfigVars configVars) {
+        super(console, true);
+
+        String vmname = configVars.getValue(DockerMachineTask.VMNAME);
+
+        add("docker-machine");
+        add("rm");
+        add("--force");
+        add(vmname);
+
+        try {
+            AbstractCommand command = new DockerMachineListCommand(console, configVars, QUIET_MODE_ON, "state=Error", null)
+                    .disableConsoleOutput();
+            command.run();
+            for (String s : command.getProcessOutput().getStdOut()) {
+                if (s != null) {
+                    if (s.split(" ").length == 1) {
+                        if (!vmname.equals(s)) {
+                            add(s);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            // do nothing
+        }
+    }
+}
diff --git a/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineStartCommand.java b/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineStartCommand.java
new file mode 100755
index 0000000..70c953b
--- /dev/null
+++ b/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineStartCommand.java
@@ -0,0 +1,21 @@
+package com.tw.go.task.dockercompose;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.AbstractCommand;
+import com.tw.go.plugin.common.ConfigVars;
+
+import static com.tw.go.task.dockercompose.DockerMachineListCommand.QUIET_MODE_ON;
+
+/**
+ * Created by thomassc on 08.05.16.
+ */
+public class DockerMachineStartCommand extends DockerMachineCommand {
+
+    public DockerMachineStartCommand(JobConsoleLogger console, ConfigVars configVars) {
+        super(console, true);
+
+        add("docker-machine");
+        add("start");
+        add(configVars.getValue(DockerMachineTask.VMNAME));
+    }
+}
diff --git a/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineTask.java b/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineTask.java
new file mode 100755
index 0000000..56e73d0
--- /dev/null
+++ b/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineTask.java
@@ -0,0 +1,131 @@
+package com.tw.go.task.dockercompose;
+
+import com.thoughtworks.go.plugin.api.GoPluginIdentifier;
+import com.thoughtworks.go.plugin.api.annotation.Extension;
+import com.thoughtworks.go.plugin.api.request.GoPluginApiRequest;
+import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
+import com.tw.go.plugin.common.*;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+@Extension
+public class DockerMachineTask extends BaseGoPlugin {
+
+    public static final String VMNAME = "VMNAME";
+    public static final String REMOVE = "REMOVE";
+
+    public static final String MACHINE_STORAGE_PATH = "MACHINE_STORAGE_PATH";
+
+    public static final String DRIVER = "DRIVER";
+    public static final String ENGINE_ENV = "ENGINE_ENV";
+    public static final String ENGINE_OPT = "ENGINE_OPT";
+
+    public static final String GENERIC_ENGINE_PORT = "GENERIC_ENGINE_PORT";
+    public static final String GENERIC_SSH_PORT = "GENERIC_SSH_PORT";
+    public static final String GENERIC_IP_ADDRESS = "GENERIC_IP_ADDRESS";
+    public static final String GENERIC_SSH_KEY = "GENERIC_SSH_KEY";
+    public static final String GENERIC_SSH_USER = "GENERIC_SSH_USER";
+
+    public static final String VSPHERE_USERNAME = "VSPHERE_USERNAME";
+    public static final String VSPHERE_PASSWORD = "VSPHERE_PASSWORD";
+    public static final String VSPHERE_CPU_COUNT = "VSPHERE_CPU_COUNT";
+    public static final String VSPHERE_MEMORY_SIZE = "VSPHERE_MEMORY_SIZE";
+    public static final String VSPHERE_DISK_SIZE = "VSPHERE_DISK_SIZE";
+    public static final String VSPHERE_VCENTER = "VSPHERE_VCENTER";
+    public static final String VSPHERE_DATACENTER = "VSPHERE_DATACENTER";
+    public static final String VSPHERE_BOOT2DOCKER_URL = "VSPHERE_BOOT2DOCKER_URL";
+
+    public static final String AZURE_SUBSCRIPTION_ID = "AZURE_SUBSCRIPTION_ID";
+    public static final String AZURE_ENVIRONMENT = "AZURE_ENVIRONMENT";
+    public static final String AZURE_IMAGE = "AZURE_IMAGE";
+    public static final String AZURE_LOCATION = "AZURE_LOCATION";
+    public static final String AZURE_RESOURCE_GROUP = "AZURE_RESOURCE_GROUP";
+    public static final String AZURE_SIZE = "AZURE_SIZE";
+    public static final String AZURE_SSH_USER = "AZURE_SSH_USER";
+    public static final String AZURE_VNET = "AZURE_VNET";
+    public static final String AZURE_SUBNET = "AZURE_SUBNET";
+    public static final String AZURE_SUBNET_PREFIX = "AZURE_SUBNET_PREFIX";
+    public static final String AZURE_AVAILABILITY_SET = "AZURE_AVAILABILITY_SET";
+    public static final String AZURE_DOCKER_PORT = "AZURE_DOCKER_PORT";
+
+    @Override
+    protected GoPluginApiResponse handleGetConfigRequest(GoPluginApiRequest request) {
+        return success(new ConfigDef()
+                .add(VMNAME, "")
+                .add(REMOVE, "", Required.NO)
+
+                .add(ENGINE_ENV, "", Required.NO)
+                .add(ENGINE_OPT, "", Required.NO)
+
+                .add(DRIVER, "undefined", Required.NO)
+
+                .add(GENERIC_IP_ADDRESS, "", Required.NO)
+                .add(GENERIC_SSH_KEY, "", Required.NO)
+                .add(GENERIC_SSH_USER, "root", Required.NO)
+                .add(GENERIC_SSH_PORT, "22", Required.NO)
+                .add(GENERIC_ENGINE_PORT, "2376", Required.NO)
+
+                .add(VSPHERE_USERNAME, "", Required.NO)
+                .add(VSPHERE_PASSWORD, "", Required.NO, Secure.YES)
+                .add(VSPHERE_CPU_COUNT, "1", Required.NO)
+                .add(VSPHERE_MEMORY_SIZE, "2048", Required.NO)
+                .add(VSPHERE_DISK_SIZE, "20000", Required.NO)
+                .add(VSPHERE_VCENTER, "", Required.NO)
+                .add(VSPHERE_DATACENTER, "", Required.NO)
+                .add(VSPHERE_BOOT2DOCKER_URL, "", Required.NO)
+
+                .add(AZURE_SUBSCRIPTION_ID, "", Required.NO)
+                .add(AZURE_ENVIRONMENT, "AzurePublicCloud", Required.NO)
+                .add(AZURE_IMAGE, "canonical:UbuntuServer:15.10:latest", Required.NO)
+                .add(AZURE_LOCATION, "westeurope", Required.NO)
+                .add(AZURE_RESOURCE_GROUP, "docker-machine", Required.NO)
+                .add(AZURE_SIZE, "Standard_A2", Required.NO)
+                .add(AZURE_SSH_USER, "docker-user", Required.NO)
+                .add(AZURE_VNET, "docker-machine", Required.NO)
+                .add(AZURE_SUBNET, "docker-machine", Required.NO)
+                .add(AZURE_SUBNET_PREFIX, "192.168.0.0/16", Required.NO)
+                .add(AZURE_AVAILABILITY_SET, "docker-machine", Required.NO)
+                .add(AZURE_DOCKER_PORT, "2376", Required.NO)
+
+                .toMap());
+    }
+
+    @Override
+    protected GoPluginApiResponse handleValidation(GoPluginApiRequest request) {
+        return success(new HashMap<String, String>());
+    }
+
+    @Override
+    protected GoPluginApiResponse handleTaskExecution(GoPluginApiRequest request) throws IOException, GeneralSecurityException {
+        Map executionRequest = (Map) gson.fromJson(request.requestBody(), Object.class);
+
+        Map<String, Map> config = (Map) executionRequest.get("config");
+
+        Context context = new Context((Map) executionRequest.get("context"));
+
+        try {
+            Result result = new DockerMachineTaskExecutor(
+                    MaskingJobConsoleLogger.getConsoleLogger(), context, config).execute();
+            return success(result.toMap());
+        } catch (Exception e) {
+            Result result = new Result(false, e.getMessage());
+            return success(result.toMap());
+        }
+    }
+
+    @Override
+    protected GoPluginApiResponse handleTaskView(GoPluginApiRequest request) {
+        return getViewResponse("Docker Machine",
+                getClass().getResourceAsStream("/views/task.template.html"));
+    }
+
+    @Override
+    public GoPluginIdentifier pluginIdentifier() {
+        return new GoPluginIdentifier("task", Arrays.asList("1.0"));
+    }
+
+}
\ No newline at end of file
diff --git a/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineTaskExecutor.java b/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineTaskExecutor.java
new file mode 100644
index 0000000..b9e5b22
--- /dev/null
+++ b/docker-machine-plugin/src/com/tw/go/task/dockercompose/DockerMachineTaskExecutor.java
@@ -0,0 +1,165 @@
+package com.tw.go.task.dockercompose;
+
+import com.thoughtworks.go.plugin.api.logging.Logger;
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.AbstractCommand;
+import com.tw.go.plugin.common.Context;
+import com.tw.go.plugin.common.Result;
+import com.tw.go.plugin.common.TaskExecutor;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.tw.go.task.dockercompose.DockerMachineListCommand.QUIET_MODE_OFF;
+import static com.tw.go.task.dockercompose.DockerMachineTask.*;
+
+public class DockerMachineTaskExecutor extends TaskExecutor {
+
+    private final Logger logger = Logger.getLoggerFor(DockerMachineTaskExecutor.class);
+
+    public DockerMachineTaskExecutor(JobConsoleLogger console, Context context, Map config) {
+        super(console, context, config);
+    }
+
+    @Override
+    protected String getPluginLogPrefix() {
+        return "[Docker Machine] ";
+    }
+
+    @Override
+    public Result execute() throws Exception {
+        try {
+            HashMap<String, String> states = getMachineStates();
+
+            new DockerMachineListCommand(console, configVars)
+                    .run();
+
+            ArrayList<NameParams> nameParams = getNameParams(configVars.getValue(VMNAME));
+            ArrayList<String> names = getExpandedValueArray(nameParams);
+
+            ArrayList<NameParams> ipParams = getNameParams(configVars.getValue(GENERIC_IP_ADDRESS));
+            ArrayList<String> addrs = getExpandedValueArray(ipParams);
+
+            if ((addrs.size() > 0) && (names.size() != addrs.size())) {
+                throw new Exception("Number of (expanded) names and ip-addresses do not match!");
+            }
+
+            for (int idx = 0; idx < names.size(); idx++) {
+                String name = names.get(idx);
+                configVars.setConfigValue(VMNAME, name);
+
+                String addr = addrs.get(idx);
+                configVars.setConfigValue(GENERIC_IP_ADDRESS, addr);
+
+                if (states.keySet().contains(name)) {
+                    if (configVars.isChecked(DockerMachineTask.REMOVE)
+                            || "Error".equalsIgnoreCase(states.get(name))) {
+                        new DockerMachineRemoveCommand(console, configVars)
+                                .run();
+                        new DockerMachineListCommand(console, configVars)
+                                .run();
+                        states.remove(name);
+                    }
+                }
+
+                if (!"undefined".equals(configVars.getValue(DockerMachineTask.DRIVER))) {
+                    if ("Stopped".equalsIgnoreCase(states.get(name))) {
+                        new DockerMachineStartCommand(console, configVars)
+                                .run();
+                    } else if (!"Running".equalsIgnoreCase(states.get(name))) {
+                        new DockerMachineCreateCommand(console, configVars)
+                                .run();
+                    }
+                    new DockerMachineListCommand(console, configVars)
+                            .run();
+                }
+            }
+        } catch (Exception e) {
+            logException(logger, e);
+            return new Result(false, getPluginLogPrefix() + e.getMessage(), e);
+        }
+
+        return new Result(true, "Finished");
+    }
+
+    public ArrayList<String> getExpandedValueArray(ArrayList<NameParams> nameParams) {
+        ArrayList<String> names = new ArrayList<>();
+        for (NameParams params : nameParams) {
+            for (int i = params.start; i <= params.stop; i += params.step) {
+                names.add(String.format(params.format, i));
+            }
+        } return names;
+    }
+
+    public HashMap<String, String> getMachineStates() throws Exception {
+        HashMap<String, String> states = new HashMap<>();
+        AbstractCommand cmd = new DockerMachineListCommand(console, configVars, QUIET_MODE_OFF, null, "{{.Name}} {{.State}}");
+        cmd.disableConsoleOutput().run();
+        for (String s : cmd.getProcessOutput().getStdOut()) {
+            String[] parts = s.split(" ");
+            states.put(parts[0], parts[1]);
+        }
+        return states;
+    }
+
+
+    private class NameParams {
+        public String format = "%d";
+        public int start = 1;
+        public int stop = 1;
+        public int step = 1;
+    }
+
+    // "front[%d,1,5]back;front[%d,1,5,2]back"
+    private ArrayList<NameParams> getNameParams(String value) {
+        ArrayList<NameParams> nameParams = new ArrayList<>();
+        if (!value.isEmpty()) {
+            for (String s : value.split(";")) {
+                if (!s.isEmpty()) {
+                    nameParams.add(splitNameParams(s));
+                }
+            }
+        }
+        return nameParams;
+    }
+
+    // "front[%d,1..5,2]back"
+    // "front[%d,1,5,2]back"
+    private NameParams splitNameParams(String value) {
+        NameParams nameParams = new NameParams();
+        value = value.replace("..", ",");
+        String[] parts = value.split("[\\[\\]]");
+
+        if (parts.length > 3) {
+            throw new IllegalArgumentException("Format allows only 3 parts: '<front>[%<format-char>,<start>,<stop>,<step>]<back>'.");
+        }
+
+        nameParams.format = parts[0];
+
+        if (parts.length > 1) {
+            parseFormatArgs(nameParams, parts);
+
+            if (parts.length == 3) {
+                nameParams.format += parts[2];
+            }
+        }
+
+
+        return nameParams;
+    }
+
+    private void parseFormatArgs(NameParams nameParams, String[] parts) {
+        String[] args = parts[1].split("[,]");
+        if (args.length < 3 || args.length > 4) {
+            throw new IllegalArgumentException("Only 3 or 4 format arguments allowed. ");
+        }
+        nameParams.format = parts[0] + args[0];
+        nameParams.start = Integer.parseInt(args[1]);
+        nameParams.stop = Integer.parseInt(args[2]);
+        if (args.length == 4) {
+            nameParams.step = Integer.parseInt(args[3]);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/docker-pipeline-plugin/pom.xml b/docker-pipeline-plugin/pom.xml
old mode 100644
new mode 100755
index c672327..90ba848
--- a/docker-pipeline-plugin/pom.xml
+++ b/docker-pipeline-plugin/pom.xml
@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.thoughtworks.go</groupId>
-    <artifactId>gocd-docker-pipeline-plugin</artifactId>
-    <version>1.0.0</version>
+    <artifactId>gocd-docker-plugin</artifactId>
+    <version>2.0.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <go.target.version>15.1.0</go.target.version>
-        <go.version>15.1.0</go.version>
+        <go.target.version>16.9.0</go.target.version>
+        <go.version>16.9.0</go.version>
         <plugin.version>${project.version}</plugin.version>
 
         <sonar.java.coveragePlugin>cobertura</sonar.java.coveragePlugin>
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.thoughtworks.go</groupId>
             <artifactId>gocd-plugin-common</artifactId>
-            <version>${project.version}</version>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -40,11 +40,6 @@
             <artifactId>gson</artifactId>
             <version>2.3.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20140107</version>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -65,7 +60,6 @@
 
     <build>
         <sourceDirectory>src</sourceDirectory>
-        <testSourceDirectory>test</testSourceDirectory>
         <resources>
             <resource>
                 <directory>resources</directory>
diff --git a/docker-pipeline-plugin/resources/plugin.xml b/docker-pipeline-plugin/resources/plugin.xml
old mode 100644
new mode 100755
index 3bd3531..c07ac63
--- a/docker-pipeline-plugin/resources/plugin.xml
+++ b/docker-pipeline-plugin/resources/plugin.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 
-<go-plugin id="docker.pipeline.plugin" version="1">
+<go-plugin id="docker.plugin" version="1">
 <about>
-<name>Docker pipeline plugin</name>
-<version>1.0</version>
-<target-go-version>15.2.0</target-go-version>
+<name>Docker plugin</name>
+<version>2.0</version>
+<target-go-version>16.9.0</target-go-version>
 <description>
     Plugin that builds a docker file, tags the images, pushes it to the artifactory and cleans everything
 </description>
@@ -13,4 +13,4 @@
     <url></url>
 </vendor>
 </about>
-        </go-plugin>
+</go-plugin>
\ No newline at end of file
diff --git a/docker-pipeline-plugin/resources/test.properties b/docker-pipeline-plugin/resources/test.properties
old mode 100644
new mode 100755
diff --git a/docker-pipeline-plugin/resources/views/task.template.html b/docker-pipeline-plugin/resources/views/task.template.html
old mode 100644
new mode 100755
index b4215ab..d4eb5b2
--- a/docker-pipeline-plugin/resources/views/task.template.html
+++ b/docker-pipeline-plugin/resources/views/task.template.html
@@ -1,99 +1,202 @@
 <div class="form_item_block">
+  <div class="checkbox_row">
+    <input id="CleanBeforeTask1" type="checkbox" ng-model="CleanBeforeTask1"
+           ng-init="CleanBeforeTask1 = CleanBeforeTask"
+           ng-change="CleanBeforeTask = CleanBeforeTask1"
+           ng-true-value="true"
+           ng-false-value="false">
+    <input id="CleanBeforeTask" type="hidden" ng-model="CleanBeforeTask" value="{{CleanBeforeTask}}">
+    <label for="CleanBeforeTask">Restart Docker service, stop and remove all containers and images</label>
+  </div><br><br>
+  <h2>Login</h2><br>
   <div class="form_item_block">
-    <div class="checkbox_row">
-      <input id="CleanBeforeTask1" type="checkbox" ng-model="CleanBeforeTask1"
-             ng-init="CleanBeforeTask1 = CleanBeforeTask"
-             ng-change="CleanBeforeTask = CleanBeforeTask1"
-             ng-true-value="true"
-             ng-false-value="false">
-      <input id="CleanBeforeTask" type="hidden" ng-model="CleanBeforeTask" value="{{CleanBeforeTask}}">
-      <label for="CleanBeforeTask">Restart Docker service, stop and remove all containers and images</label>
-    </div>
+    <label>Username </label>
+    <input type="text" ng-model="RegistryUsername" ng-required="false">
+    <span class="form_error" ng-show="GOINPUTNAME[RegistryUsername].$error.server">{{ GOINPUTNAME[RegistryUsername].$error.server }}</span>
   </div>
 
   <div class="form_item_block">
-    <div class="checkbox_row">
-      <input id="CleanAfterTask1" type="checkbox" ng-model="CleanAfterTask1"
-             ng-init="CleanAfterTask1 = CleanAfterTask"
-             ng-change="CleanAfterTask = CleanAfterTask1"
-             ng-true-value="true"
-             ng-false-value="false">
-      <input id="CleanAfterTask" type="hidden" ng-model="CleanAfterTask" value="{{CleanAfterTask}}">
-      <label for="CleanAfterTask">Remove all images after push</label>
-    </div>
+    <label>Password </label>
+    <input type="password" ng-model="RegistryPassword" ng-required="false">
+    <span class="form_error" ng-show="GOINPUTNAME[RegistryPassword].$error.server">{{ GOINPUTNAME[RegistryPassword].$error.server }}</span>
   </div>
-</div>
 
-<h3>Build settings:</h3>
-<div class="form_item_block">
-  <label>Build args:</label>
-  <input type="text" ng-model="BuildArgs" ng-required="false">
-  <div class="inline_instruction">Provide one or multiple tags separated by ';'. Define a different separator as the VERY FIRST character (example "|arg1=xyz|arg2=123") </div>
-  <span class="form_error" ng-show="GOINPUTNAME[BuildArgs].$error.server">{{ GOINPUTNAME[BuildArgs].$error.server }}</span>
-</div>
+  <div class="form_item_block">
+    <label>Registry URL </label>
+    <input type="text" ng-model="RegistryURLForLogin" ng-required="false">
+    <span class="form_error" ng-show="GOINPUTNAME[RegistryURLForLogin].$error.server">{{ GOINPUTNAME[RegistryURLForLogin].$error.server }}</span>
+  </div>
 
-<div class="form_item_block">
-  <label>Image name:<span class="asterisk">*</span>
-  </label>
-  <input type="text" ng-model="ImageName" ng-required="true">
-  <span class="form_error" ng-show="GOINPUTNAME[ImageName].$error.server">{{ GOINPUTNAME[ImageName].$error.server }}</span>
+  <div class="checkbox_row">
+    <input id="isPush2" type="checkbox" ng-model="isPush2"
+           ng-init="isPush2 = isPush"
+           ng-change="isPush = isPush2" ng-true-value="true" ng-false-value="false">
+    <input id="pushCheckBox" type="hidden" ng-model="isPush" value="{{isPush}}">
+    <label>Push the resulting image(s)</label>
+  </div>
 </div>
 
 <div class="form_item_block">
-  <label>Dockerfile path and its name :
-  </label>
-  <input type="text" ng-model="DockerFileName" ng-required="false">
-  <div class="inline_instruction">Path and name of Dockerfile relative to repository-root (default is ./Dockerfile).
+  <h2>Build</h2>
+
+  <div class="checkbox_row">
+    <input id="BUILD_NO_CACHE2" type="checkbox" ng-model="BUILD_NO_CACHE2"
+           ng-init="BUILD_NO_CACHE2 = BUILD_NO_CACHE"
+           ng-change="BUILD_NO_CACHE = BUILD_NO_CACHE2" ng-true-value="true" ng-false-value="false">
+    <input id="buildNoCache" type="hidden" ng-model="BUILD_NO_CACHE" value="{{BUILD_NO_CACHE}}">
+    <label>Disable cache while building the image (might take MUCH longer)</label>
   </div>
-<span class="form_error"
-      ng-show="GOINPUTNAME[DockerFileName].$error.server">{{ GOINPUTNAME[DockerFileName].$error.server }}</span>
-</div>
 
-<h3>Tag settings:</h3>
-<div class="form_item_block">
-  <label>Username:
-  </label>
-  <input type="text" ng-model="Username" ng-required="false">
-<span class="form_error"
-      ng-show="GOINPUTNAME[Username].$error.server">{{ GOINPUTNAME[Username].$error.server }}</span>
-</div>
+  <div class="checkbox_row">
+    <input id="BUILD_MICROLABELING2" type="checkbox" ng-model="BUILD_MICROLABELING2"
+           ng-init="BUILD_MICROLABELING2 = BUILD_MICROLABELING"
+           ng-change="BUILD_MICROLABELING = BUILD_MICROLABELING2" ng-true-value="true" ng-false-value="false">
+    <input id="buildMicrolabeling" type="hidden" ng-model="BUILD_MICROLABELING" value="{{BUILD_MICROLABELING}}">
+    <label>Enable microlabeling</label>
+  </div>
 
-<div class="form_item_block">
-  <label>Image tag:<span class="asterisk">*</span>
-  </label>
-  <input type="text" ng-model="ImageTag" ng-required="true">
-  <div class="inline_instruction">You must specify at least one tag. Provide multiple tags separated by ';'. Define a different separator as the VERY FIRST character (example "|tag1|tag2") </div>
-  <span class="form_error" ng-show="GOINPUTNAME[ImageTag].$error.server">{{ GOINPUTNAME[ImageTag].$error.server }}</span>
-</div>
+  <div class="form_item_block">
+    <label>Build args</label>
+    <input type="text" ng-model="BuildArgs" ng-required="false">
+    <div class="inline_instruction">Provide one or multiple tags separated by ';'. Define a different separator as
+      the
+      VERY FIRST character (example "|arg1=xyz|arg2=123")
+    </div>
+    <span class="form_error" ng-show="GOINPUTNAME[BuildArgs].$error.server">{{ GOINPUTNAME[BuildArgs].$error.server }}</span>
+  </div>
 
-<h3>Push settings:</h3>
-<div class="form_item_block">
-  <label>Username:
-  </label>
-  <input type="text" ng-model="RegistryUsername" ng-required="false">
-<span class="form_error"
-      ng-show="GOINPUTNAME[RegistryUsername].$error.server">{{ GOINPUTNAME[RegistryUsername].$error.server }}</span>
+  <div class="form_item_block">
+    <label>Dockerfile path and its name </label>
+    <input type="text" ng-model="DockerFileName" ng-required="false">
+    <div class="inline_instruction">Path and name of Dockerfile relative to repository-root (default is
+      ./Dockerfile).
+    </div>
+    <span class="form_error" ng-show="GOINPUTNAME[DockerFileName].$error.server">{{ GOINPUTNAME[DockerFileName].$error.server }}</span>
+  </div>
 </div>
 
 <div class="form_item_block">
-  <label>Password:
-  </label>
-  <input type="password" ng-model="RegistryPassword" ng-required="false">
-<span class="form_error"
-      ng-show="GOINPUTNAME[RegistryPassword].$error.server">{{ GOINPUTNAME[RegistryPassword].$error.server }}</span>
+  <h2>Push</h2><br>
+  <div class="form_item_block">
+    <label>Username </label>
+    <input type="text" ng-model="Username" ng-required="false">
+        <span class="form_error"
+              ng-show="GOINPUTNAME[Username].$error.server">{{ GOINPUTNAME[Username].$error.server }}</span>
+  </div>
+
+  <div class="form_item_block">
+    <label>Image name </label>
+    <input type="text" ng-model="ImageName" ng-required="false">
+    <span class="form_error" ng-show="GOINPUTNAME[ImageName].$error.server">{{ GOINPUTNAME[ImageName].$error.server }}</span>
+  </div>
+
+  <div class="form_item_block">
+    <label>Image tag </label>
+    <input type="text" ng-model="ImageTag" ng-required="false">
+    <div class="inline_instruction">You must specify at least one tag. Provide multiple tags separated by ';'.
+      Define a
+      different separator as the VERY FIRST character (example "|tag1|tag2")
+    </div>
+        <span class="form_error"
+              ng-show="GOINPUTNAME[ImageTag].$error.server">{{ GOINPUTNAME[ImageTag].$error.server }}</span>
+  </div>
+
+  <div class="form_item_block">
+    <label>Tag postfix</label>
+    <input type="text" ng-model="IMAGE_TAG_POSTFIX" ng-required="false">
+    <span class="form_error" ng-show="GOINPUTNAME[IMAGE_TAG_POSTFIX].$error.server">{{ GOINPUTNAME[IMAGE_TAG_POSTFIX].$error.server }}</span>
+    <div class="inline_instruction">The tag postfix will be appended to all tags like "...:tag-postfix"</div>
+  </div>
+
 </div>
 
 <div class="form_item_block">
-  <label>E-mail adress:
-  </label>
-  <input type="text" ng-model="RegistryEmail" ng-required="false">
-  <div class="inline_instruction">Deprecated since docker 1.11</div>
-  <span class="form_error" ng-show="GOINPUTNAME[RegistryEmail].$error.server">{{ GOINPUTNAME[RegistryEmail].$error.server }}</span>
+  <h2>Run</h2>
+  <div class="inline_instruction">Run an arbritrary container from inside the task. The current pipeline directory
+    can be accessed as a volume and is set as the initial working directory.</div>
+
+  <div class="form_item_block">
+    <label>Image</label>
+    <input type="text" ng-model="RUN_IMAGE" ng-required="false">
+        <span class="form_error"
+              ng-show="GOINPUTNAME[RUN_IMAGE].$error.server">{{ GOINPUTNAME[RUN_IMAGE].$error.server }}</span>
+  </div>
+
+  <div class="form_item_block">
+    <label>Environment variables</label>
+    <input type="text" ng-model="RUN_ENV_VARS" ng-required="false">
+    <div class="inline_instruction">Provide one or multiple vars separated by ';'. Define a different separator as
+      the
+      VERY FIRST character (example "|arg1=xyz|arg2=123")
+    </div>
+    <span class="form_error" ng-show="GOINPUTNAME[RUN_ENV_VARS].$error.server">{{ GOINPUTNAME[RUN_ENV_VARS].$error.server }}</span>
+  </div>
+
+  <div class="form_item_block">
+    <label>Command and args</label>
+    <input type="text" ng-model="RUN_ARGS" ng-required="false">
+        <span class="form_error"
+              ng-show="GOINPUTNAME[RUN_ARGS].$error.server">{{ GOINPUTNAME[RUN_ARGS].$error.server }}</span>
+  </div>
+
+  <div class="form_item_block">
+    <div class="form_item_block">
+      <label>BEFORE run, copy FROM </label>
+      <input type="text" ng-model="RUN_PRE_COPY_FROM" ng-required="false">
+            <span class="form_error"
+                  ng-show="GOINPUTNAME[RUN_PRE_COPY_FROM].$error.server">{{ GOINPUTNAME[RUN_PRE_COPY_FROM].$error.server }}</span>
+    </div>
+
+
+    <div class="form_item_block">
+      <label>BEFORE run, copy TO </label>
+      <input type="text" ng-model="RUN_PRE_COPY_TO" ng-required="false">
+            <span class="form_error"
+                  ng-show="GOINPUTNAME[RUN_PRE_COPY_TO].$error.server">{{ GOINPUTNAME[RUN_PRE_COPY_TO].$error.server }}</span>
+    </div>
+
+    <div class="form_item_block">
+      <label>AFTER run, copy FROM </label>
+      <input type="text" ng-model="RUN_POST_COPY_FROM" ng-required="false">
+            <span class="form_error"
+                  ng-show="GOINPUTNAME[RUN_POST_COPY_FROM].$error.server">{{ GOINPUTNAME[RUN_POST_COPY_FROM].$error.server }}</span>
+    </div>
+
+
+    <div class="form_item_block">
+      <label>AFTER run, copy TO </label>
+      <input type="text" ng-model="RUN_POST_COPY_TO" ng-required="false">
+            <span class="form_error"
+                  ng-show="GOINPUTNAME[RUN_POST_COPY_TO].$error.server">{{ GOINPUTNAME[RUN_POST_COPY_TO].$error.server }}</span>
+    </div>
+  </div>
+
 </div>
 
 <div class="form_item_block">
-  <label>Registry URL:<span class="asterisk">*</span>
-  </label>
-  <input type="text" ng-model="RegistryURLForLogin" ng-required="true">
-  <span class="form_error" ng-show="GOINPUTNAME[RegistryURLForLogin].$error.server">{{ GOINPUTNAME[RegistryURLForLogin].$error.server }}</span>
-</div>
\ No newline at end of file
+  <h2>Cleanup</h2>
+
+  <div class="form_item_block">
+    <div class="checkbox_row">
+      <input id="CleanAfterTask1" type="checkbox" ng-model="CleanAfterTask1"
+             ng-init="CleanAfterTask1 = CleanAfterTask"
+             ng-change="CleanAfterTask = CleanAfterTask1"
+             ng-true-value="true"
+             ng-false-value="false">
+      <input id="CleanAfterTask" type="hidden" ng-model="CleanAfterTask" value="{{CleanAfterTask}}">
+      <label for="CleanAfterTask">Remove all the exited containers and dangling images</label>
+    </div>
+  </div>
+
+  <div class="form_item_block">
+    <div class="checkbox_row">
+      <input id="CleanAfterTask2" type="checkbox" ng-model="CleanAfterTask2"
+             ng-init="CleanAfterTask2 = CleanAfterComplete"
+             ng-change="CleanAfterComplete = CleanAfterTask2"
+             ng-true-value="true"
+             ng-false-value="false">
+      <input id="CleanAfterComplete" type="hidden" ng-model="CleanAfterComplete" value="{{CleanAfterComplete}}">
+      <label for="CleanAfterComplete">Remove all images and containers</label>
+    </div>
+  </div>
+</div>
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/Config.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/Config.java
deleted file mode 100644
index b272b36..0000000
--- a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/Config.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.tw.go.task.dockerpipeline;
-
-public class Config
-{
-    public final boolean cleanBeforeTask;
-    public final boolean cleanAfterTask;
-    public final String imageName;
-    public final String dockerFileName;
-    public final String buildArgs;
-    public final String username;
-    public final String imageTag;
-    public final String registryUsername;
-    public final String registryPassword;
-    public final String registryEmail;
-    public final String registryUrlForLogin;
-
-    public Config (ConfigVars config)
-    {
-        cleanBeforeTask = Boolean.parseBoolean(config.getValue(DockerTask.CLEAN_BEFORE_TASK));
-
-        imageName = config.getValue(DockerTask.IMAGE_NAME);
-        dockerFileName = config.getValue(DockerTask.DOCKER_FILE_NAME);
-        buildArgs = config.getValue(DockerTask.BUILD_ARGS);
-
-        username = config.getValue(DockerTask.USERNAME);
-        imageTag = config.getValue(DockerTask.IMAGE_TAG);
-
-        registryUsername = config.getValue(DockerTask.REGISTRY_USERNAME);
-        registryPassword = config.getValue(DockerTask.REGISTRY_PASSWORD);
-        registryEmail = config.getValue(DockerTask.REGISTRY_EMAIL);
-        registryUrlForLogin = config.getValue(DockerTask.REGISTRY_URL_FOR_LOGIN);
-
-        cleanAfterTask = Boolean.parseBoolean(config.getValue(DockerTask.CLEAN_AFTER_TASK));
-    }
-}
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/ConfigVars.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/ConfigVars.java
deleted file mode 100644
index 0d0d010..0000000
--- a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/ConfigVars.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.tw.go.task.dockerpipeline;
-
-import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
-import com.thoughtworks.go.plugin.api.task.TaskExecutionContext;
-import com.tw.go.plugin.common.VarsExpander;
-
-import java.util.*;
-
-public class ConfigVars
-{
-    protected static TaskExecutionContext context;
-    protected HashMap<String, String> vars = new HashMap<>();
-    protected ArrayList<String> secure;
-    protected VarsExpander expander;
-
-
-    public ConfigVars(Map<String, Map> config)
-    {
-        this(config, new HashMap<String, String>(), new ArrayList<String>());
-    }
-
-    public ConfigVars(Map<String, Map> config, Map<String, String> envVars, ArrayList<String> secure)
-    {
-        expander = new VarsExpander(envVars);
-
-        for (Map.Entry<String, Map> entry : config.entrySet())
-        {
-            String key = entry.getKey();
-            Map cfg = entry.getValue();
-
-            if ((boolean) cfg.get("secure") && !secure.contains(key))
-            {
-                secure.add(key);
-            }
-
-            vars.put(key, (String)cfg.get("value"));
-        }
-
-        Collections.sort(secure, new Comparator<String>()
-        {
-            @Override
-            public int compare(String s, String t1)
-            {
-                return t1.length() - s.length();
-            }
-        });
-
-        this.secure = secure;
-    }
-
-    public void printConfig(JobConsoleLogger console, String prefix)
-    {
-        for (Map.Entry<String, String> cfg : vars.entrySet())
-        {
-            String key = cfg.getKey();
-
-            if (secure.contains(key))
-            {
-                console.printLine(prefix + key + ": *****");
-            }
-            else
-            {
-                console.printLine(prefix + key + ": " + cfg.getValue());
-            }
-        }
-    }
-
-    public String getValue(String key)
-    {
-        return expander.expand(vars.get(key));
-    }
-
-    public String getRawValue(String key)
-    {
-        return vars.get(key);
-    }
-
-    public String mask(String text)
-    {
-        for (String key : secure)
-        {
-            String search = getValue(key);
-            String replaced = text.replace(search, "*****");
-            text = replaced;
-        }
-
-        return text;
-    }
-}
\ No newline at end of file
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerBuildCommand.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerBuildCommand.java
old mode 100644
new mode 100755
index ba0351e..b61eeba
--- a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerBuildCommand.java
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerBuildCommand.java
@@ -1,54 +1,111 @@
 package com.tw.go.task.dockerpipeline;
 
-import com.tw.go.plugin.common.Context;
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.*;
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.regex.Pattern;
-
-public class DockerBuildCommand extends DockerCommand
-{
-    public DockerBuildCommand(Context taskContext, Config taskConfig)
-    {
-        String context = getDockerfilePath(taskContext, taskConfig).getParent().toString(); // the path without the Dockerfile. Used for obtaining the build context
-        String dockerfilePath = getDockerfileName(taskContext, taskConfig); // the path including the Dockerfile. Used for pointing to the Dockerfile
-        String username = getUsername(taskConfig);
-        String registryName = getRegistryName(taskConfig.registryUrlForLogin);
-        String baseImageName = makeBaseName(registryName, username, taskConfig.imageName);
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import static com.tw.go.plugin.common.GoApiConstants.ENVVAR_GO_REVISION;
+import static com.tw.go.plugin.common.GoApiConstants.ENVVAR_NAME_GO_PIPELINE_COUNTER;
+import static com.tw.go.plugin.common.GoApiConstants.ENVVAR_NAME_GO_PIPELINE_NAME;
+
+
+public class DockerBuildCommand extends DockerCommand {
+    protected List<String> imageAndTag = new ArrayList<>();
+    protected String repositoryUrl = "";
+
+    public DockerBuildCommand(JobConsoleLogger console, ConfigVars configVars, String repoUrl) {
+        super(console, configVars);
+        String dockerfileAbsolutePath = getDockerfileAbsolutePath(configVars); // the path including the Dockerfile. Used for pointing to the Dockerfile
+        String context = getDirectory(dockerfileAbsolutePath); // the path without the Dockerfile. Used for obtaining the build context
+
+        String username = getUsername(configVars);
+        String registryName = getRegistryName(configVars.getValue(DockerTask.REGISTRY_URL_FOR_LOGIN));
+        String baseImageName = makeBaseName(registryName, username, configVars.getValue(DockerTask.IMAGE_NAME));
 
         add("docker");
         add("build");
 
+        // tbd: why had this been commented out?
+        // race conditions? obsolete amount of work?
+        add("--pull=true");
+        add("--force-rm");
+
         add("-f");
-        add(dockerfilePath);
+        add(dockerfileAbsolutePath);
+
+        if (configVars.isChecked(DockerTask.BUILD_NO_CACHE)) {
+            add("--no-cache");
+        }
 
-        addBuildArgs(taskConfig.buildArgs);
+        repositoryUrl = repoUrl;
 
-        addImageTag(baseImageName, taskConfig.imageTag);
+        //console.printLine("repoUrl" + repositoryUrl);
+
+        addBuildArgs(configVars);
+
+        addImageTag(baseImageName, configVars.getValue(DockerTask.IMAGE_TAG), configVars.getValue(DockerTask.IMAGE_TAG_POSTFIX));
 
         add(context);
     }
 
-    private void addBuildArgs(String buildArgs)
-    {
-        for (String buildArg : splitByFirstOrDefault(buildArgs, ';'))
-        {
-            if(!buildArg.isEmpty())
-            {
+    public void addBuildArgs(ConfigVars configVars) {
+
+        String buildArgs = configVars.getValue(DockerTask.BUILD_ARGS);
+
+        if (configVars.isChecked(DockerTask.BUILD_MICROLABELING)) {
+            for (String microlabel : ListUtil.splitByFirstOrDefault(buildMicroLabeling(configVars), ';')) {
+                if (!microlabel.isEmpty()) {
+                    command.add("--build-arg");
+                    command.add(microlabel);
+                }
+            }
+        }
+
+        for (String buildArg : ListUtil.splitByFirstOrDefault(buildArgs, ';')) {
+            if (!buildArg.isEmpty()) {
                 command.add("--build-arg");
                 command.add(buildArg);
             }
         }
     }
 
-    private void addImageTag(String baseName, String tags)
-    {
-        for (String tag : splitByFirstOrDefault(tags, ';'))
-        {
-            if(!tag.isEmpty())
-            {
+    private String buildMicroLabeling(ConfigVars configVars) {
+        String BUILD_VENDOR = "BUILD_VENDOR=";
+        String BUILD_NAME = "BUILD_NAME=";
+        String BUILD_VERSION = "BUILD_VERSION=";
+        String BUILD_DATE = "BUILD_DATE=";
+        String REPOSITORY_URL = "REPOSITORY_URL=";
+        String REPOSITORY_REF = "REPOSITORY_REF=";
+
+        Date dt = new Date();
+        SimpleDateFormat date_format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String timestamp = date_format.format(dt);
+
+        BUILD_VENDOR += "Haufe-Lexware" + ";";
+        BUILD_NAME += configVars.getValue(DockerTask.IMAGE_NAME) + ";";
+        BUILD_VERSION += configVars.getValue(ENVVAR_NAME_GO_PIPELINE_COUNTER) + ";";
+        BUILD_DATE += timestamp + ";";
+        REPOSITORY_URL += repositoryUrl + ";";
+        REPOSITORY_REF += configVars.getValue(ENVVAR_GO_REVISION) + ";";
+
+        return BUILD_VENDOR + BUILD_NAME +
+                BUILD_VERSION + BUILD_DATE +
+                REPOSITORY_URL + REPOSITORY_REF;
+    }
+
+    public void addImageTag(String baseName, String tags, String tagPostfix) {
+        for (String tag : ListUtil.splitByFirstOrDefault(tags, ';')) {
+            if (!tag.isEmpty()) {
+                if (!tagPostfix.isEmpty()) {
+                    tag += "-" + tagPostfix;
+                }
                 String taggedName = baseName + ":" + tag;
                 command.add("-t");
                 command.add(taggedName);
@@ -57,72 +114,56 @@ private void addImageTag(String baseName, String tags)
         }
     }
 
-    private String[] splitByFirstOrDefault(String args, Character separator)
-    {
-        if(!args.isEmpty())
-        {
-            Character first = args.charAt(0);
-
-            if(!(Character.isLetterOrDigit(first)))
-            {
-                separator = first;
-                args = args.substring(1);
-            }
+    public String makeBaseName(String registry, String username, String imageName) {
+        String result = imageName;
 
-            return args.split(Pattern.quote(separator.toString()));
+        if (!username.isEmpty()) {
+            result = username + "/" + result;
         }
 
-        return new String[]{};
-    }
+        if (!registry.isEmpty()) {
+            result = registry + "/" + result;
+        }
 
-    private String makeBaseName(String registry, String username, String imageName)
-    {
-        return registry + "/" + username + imageName;
+        return result;
     }
 
-    private String getDockerfileName(Context taskContext, Config taskConfig)
-    {
-        String result = taskConfig.dockerFileName.isEmpty() ?
-                taskContext.getWorkingDir() + "/" + "Dockerfile" :
-                taskContext.getWorkingDir() + "/" + taskConfig.dockerFileName;
+    public String getDockerfileAbsolutePath(ConfigVars configVars) {
+        String dockerfile = configVars.isEmpty(DockerTask.DOCKER_FILE_NAME) ? "Dockerfile" : configVars.getValue(DockerTask.DOCKER_FILE_NAME);
 
-        return result;
+        return Paths.get(getAbsoluteWorkingDir() + "/" + dockerfile)
+                .toAbsolutePath()
+                .normalize()
+                .toString();
     }
 
-    private String getUsername(Config taskConfig)
-    {
-        if(!taskConfig.registryUsername.isEmpty())
-        {
-            return taskConfig.username.isEmpty() ? taskConfig.registryUsername + "/" : taskConfig.username + "/";
+    public String getUsername(ConfigVars configVars) {
+        if (!configVars.isEmpty(DockerTask.USERNAME)) {
+            return configVars.getValue(DockerTask.USERNAME);
         }
 
-        return "";
+        return configVars.getValue(DockerTask.REGISTRY_USERNAME);
     }
 
-    private Path getDockerfilePath(Context taskContext, Config taskConfig)
-    {
-        Path dockerPath = Paths.get(getDockerfileName(taskContext, taskConfig)).toAbsolutePath().normalize();
-
-        return dockerPath;
+    public String getDirectory(String dockerFile) {
+        return Paths.get(dockerFile).getParent().toString();
     }
 
-    private String getRegistryName(String registryAddress)
-    {
-        try
-        {
-            if (-1 == registryAddress.indexOf("://"))
-            {
+    public String getRegistryName(String registryAddress) {
+        try {
+            if (-1 == registryAddress.indexOf("://")) {
                 registryAddress = "http://" + registryAddress;
             }
 
             return new URL(registryAddress).getAuthority();
-        }
-
-        catch (MalformedURLException e)
-        {
+        } catch (MalformedURLException e) {
             e.printStackTrace();
         }
 
         return "";
     }
+
+    public List<String> getCommand() {
+        return command;
+    }
 }
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerCleanBefore.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerCleanBefore.java
deleted file mode 100644
index e4cf733..0000000
--- a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerCleanBefore.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.tw.go.task.dockerpipeline;
-
-import com.tw.go.plugin.common.Context;
-
-public class DockerCleanBefore extends DockerMultipleCommand
-{
-    public DockerCleanBefore(Context taskContext, Config taskConfig)
-    {
-        runCommand(new DockerRestartCommand(taskContext, taskConfig))
-                .then(new DockerStopContainers(taskContext, taskConfig))
-                .then(new DockerRemoveAllContainers(taskContext, taskConfig))
-                .then(new DockerRemoveAllImages(taskContext, taskConfig));
-    }
-}
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerCleanCommand.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerCleanCommand.java
deleted file mode 100644
index e90df67..0000000
--- a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerCleanCommand.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.tw.go.task.dockerpipeline;
-
-import com.tw.go.plugin.common.Context;
-
-/**
- * Created by BradeaC on 21/12/2015.
- */
-public class DockerCleanCommand extends DockerCommand
-{
-    public DockerCleanCommand(Context taskContext, Config taskConfig)
-    {
-        command.add("/bin/sh");
-        command.add("-c");
-        command.add("test -n \"$(docker images -qa)\" && docker rmi -f $(docker images -qa) || echo \"No images to delete\"");
-    }
-}
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerCommand.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerCommand.java
old mode 100644
new mode 100755
index bf91e0e..892cffa
--- a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerCommand.java
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerCommand.java
@@ -1,91 +1,65 @@
 package com.tw.go.task.dockerpipeline;
 
 import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
-import com.tw.go.plugin.common.InputStreamDecorator;
+import com.tw.go.plugin.common.AbstractCommand;
+import com.tw.go.plugin.common.ConfigVars;
 
 import java.util.ArrayList;
-import java.util.List;
 
-public abstract class DockerCommand implements ICommand
-{
-    protected List<String> command = new ArrayList<>();
-    protected List<String> imageAndTag = new ArrayList<>();
+/**
+ * Created by thomassc on 30.06.16.
+ */
+public class DockerCommand extends AbstractCommand {
 
-    protected static JobConsoleLogger logger = JobConsoleLogger.getConsoleLogger();
+    public DockerCommand(JobConsoleLogger console, ConfigVars configVars) {
+        super(console);
 
-    public static void setPrefix(String prefix)
-    {
-        DockerCommand.prefix = prefix;
+        // 1. just copy from the current environment
+        addEnv(configVars.environmentVars());
     }
 
-    private static String prefix;
-
-    public static void setConfigVars(ConfigVars configVars)
-    {
-        DockerCommand.configVars = configVars;
-    }
-
-    protected static ConfigVars configVars;
-
-    @Override
-    public void run() throws Exception
-    {
-        logger.printLine(prefix + "Run " + configVars.mask(renderDisplay()));
-
-        ProcessBuilder processBuilder = new ProcessBuilder(command);
-        Process process = processBuilder.start();
-
-        logger.readErrorOf(new InputStreamDecorator(process.getErrorStream(), prefix));
-        logger.readOutputOf(new InputStreamDecorator(process.getInputStream(), prefix));
-
-//        logger.readErrorOf(process.getErrorStream());
-//        logger.readOutputOf(process.getInputStream());
-
-        int exitCode = process.waitFor();
-        process.destroy();
-
-        if (exitCode != 0)
-        {
-            throw new ExitCodeNotZeroException("Failed while running task");
-        }
-    }
-
-    public void add(String setting)
-    {
-        command.add(setting);
-    }
-
-    protected String renderDisplay()
-    {
-        StringBuilder sb = new StringBuilder();
-
-        for (String s : command)
-        {
-            if (sb.length() > 0)
-            {
-                sb.append(' ');
+    protected ArrayList<String> splitArgs(String argString) {
+        ArrayList<String> args = new ArrayList<String>();
+
+        int idx = 0;
+        argString += " ";
+        String token = "";
+        boolean inQuotes = false;
+        char c;
+        while (true) {
+            if (idx == argString.length()) {
+                break;
             }
-
-            if (sb.length() == 0 || s.charAt(0) == '-')
-            {
-                sb.append(s);
-            }
-            else
-            {
-                sb.append('"');
-                sb.append(s);
-                sb.append('"');
+            switch (c = argString.charAt(idx++)) {
+                case '"':
+                    if (inQuotes) {
+                        if (token.length() > 0) {
+                            args.add(token);
+                            token = "";
+                        }
+                        inQuotes = false;
+                    } else {
+                        inQuotes = true;
+                    }
+                    break;
+                case ' ':
+                    if (inQuotes) {
+                        token += c;
+                    } else {
+                        if (token.length() > 0) {
+                            args.add(token);
+                            token = "";
+                        }
+                    }
+                    break;
+                case '\\':
+                    c = argString.charAt(idx++);
+                default:
+                    token += c;
+                    break;
             }
         }
 
-        return sb.toString();
-    }
-
-    public class ExitCodeNotZeroException extends Exception
-    {
-        public ExitCodeNotZeroException(String s)
-        {
-            super(s);
-        }
+        return args;
     }
-}
+}
\ No newline at end of file
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerContainerIdCommand.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerContainerIdCommand.java
new file mode 100755
index 0000000..75e9567
--- /dev/null
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerContainerIdCommand.java
@@ -0,0 +1,72 @@
+package com.tw.go.task.dockerpipeline;
+
+import com.google.gson.GsonBuilder;
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.ConfigVars;
+import com.tw.go.plugin.common.ProcessOutput;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Map;
+
+public class DockerContainerIdCommand extends DockerCommand {
+
+    public DockerContainerIdCommand(JobConsoleLogger console, ConfigVars configVars) {
+        super(console, configVars);
+
+        disableConsoleOutput();
+
+        try {
+            add("docker");
+            add("ps");
+            add("-q");
+            run();
+            ProcessOutput output = getProcessOutput();
+            if (output.isZeroReturnCode() && (output.getStdOut().size() > 0)) {
+                command.clear();
+                add("docker");
+                add("inspect");
+                for (String s : output.getStdOut()) {
+                    add(s);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static String extractId(ProcessOutput output) {
+        if (output.isZeroReturnCode() && (output.getStdOut().size() > 0)) {
+            try {
+                InetAddress iAddress = InetAddress.getLocalHost();
+                String currentIp = iAddress.getHostAddress();
+
+                String json = "";
+                for (String s : output.getStdOut()) {
+                    json += s;
+                }
+
+                ArrayList list = (ArrayList) new GsonBuilder().serializeNulls().create().fromJson(json, Object.class);
+
+                for (int i = 0; i < list.size(); i++) {
+                    Map cont = (Map)list.get(i);
+                    Map networkSettings = (Map)cont.get("NetworkSettings");
+                    Map<String,Object> networks = (Map)networkSettings.get("Networks");
+                    for (String k : networks.keySet()) {
+                        Map network = (Map)networks.get(k);
+                        String ip = (String)network.get("IPAddress");
+                        if (ip.equals(currentIp)) {
+                            String id = (String)cont.get("Id");
+                            return id;
+                        }
+                    }
+                }
+            } catch (UnknownHostException e) {
+//            e.printStackTrace();
+            }
+        }
+
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerCpCommand.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerCpCommand.java
new file mode 100644
index 0000000..022713d
--- /dev/null
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerCpCommand.java
@@ -0,0 +1,17 @@
+package com.tw.go.task.dockerpipeline;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.ConfigVars;
+
+public class DockerCpCommand extends DockerCommand
+{
+
+    public DockerCpCommand(JobConsoleLogger console, ConfigVars configVars, String source, String dest)
+    {
+        super(console, configVars);
+        add("docker");
+        add("cp");
+        add(source);
+        add(dest);
+    }
+}
\ No newline at end of file
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerCreateCommand.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerCreateCommand.java
new file mode 100644
index 0000000..1b7e1ac
--- /dev/null
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerCreateCommand.java
@@ -0,0 +1,75 @@
+package com.tw.go.task.dockerpipeline;
+
+import com.thoughtworks.go.plugin.api.logging.Logger;
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.AbstractCommand;
+import com.tw.go.plugin.common.ConfigVars;
+import com.tw.go.plugin.common.ListUtil;
+
+import java.util.ArrayList;
+
+public class DockerCreateCommand extends DockerCommand {
+
+    private final Logger logger = Logger.getLoggerFor(DockerCreateCommand.class);
+    protected String _containerName = null;
+
+    public DockerCreateCommand(JobConsoleLogger console, ConfigVars configVars) throws Exception {
+        super(console, configVars);
+        add("docker");
+        add("create");
+        add("--name");
+        this._containerName = createRandomContainerName();
+        add(this._containerName);
+
+        /*
+        String id = getContainerID(console, configVars);
+        String workingDir = getAbsoluteWorkingDir();
+        if (id != null) {
+            logger.info(String.format("Running inside container '%s'. Using '--volume-from' with working directory set to '%s'", id, workingDir));
+            // todo: check, if the container provides access to the actual pipeline directory
+            // e.g. "/var/lib/go-agent" ..
+            add("--volumes-from");
+            add(id);
+        } else {
+            logger.info(String.format("(Most likely) NOT running in container. Using '--volume' with working directory set to '%s'", workingDir));
+            add("--volume");
+            add(workingDir + ":" + workingDir);
+        }
+
+        add("--workdir");
+        add(workingDir);
+        */
+
+        addRunEnvVars(configVars.getValue(DockerTask.RUN_ENV_VARS));
+
+        add(configVars.getValue(DockerTask.RUN_IMAGE));
+        for (String arg : splitArgs(configVars.getValue(DockerTask.RUN_ARGS))) {
+            add(arg);
+        }
+    }
+
+    protected String createRandomContainerName() {
+        String randomId = Long.toHexString(Double.doubleToLongBits(Math.random()));
+        return String.format("tmp_%s", randomId);        
+    }
+
+    protected String getContainerName() {
+        return this._containerName;
+    }
+
+    protected void addRunEnvVars(String envVars) {
+        for (String envVar : ListUtil.splitByFirstOrDefault(envVars, ';')) {
+            if (!envVar.isEmpty()) {
+                command.add("-e");
+                command.add(envVar);
+            }
+        }
+    }
+
+    protected String getContainerID(JobConsoleLogger console, ConfigVars configVars) throws Exception {
+        AbstractCommand cmd = new DockerContainerIdCommand(console, configVars)
+                .disableConsoleOutput();
+        cmd.run();
+        return DockerContainerIdCommand.extractId(cmd.getProcessOutput());
+    }
+}
\ No newline at end of file
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerEngine.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerEngine.java
new file mode 100755
index 0000000..8bb7a04
--- /dev/null
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerEngine.java
@@ -0,0 +1,37 @@
+package com.tw.go.task.dockerpipeline;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+public class DockerEngine {
+    public static List<String> getIds(String[] params) {
+        ProcessBuilder pb = new ProcessBuilder(params);
+        Process p = null;
+        try {
+            p = pb.start();
+            p.waitFor();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
+        ArrayList<String> ids = new ArrayList<>();
+        for (; ; ) {
+            try {
+                String line = br.readLine();
+                if (line == null) {
+                    break;
+                }
+                ids.add(line);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return ids;
+    }
+}
\ No newline at end of file
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerLoginCommand.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerLoginCommand.java
index 63a7f0c..eb7a6b2 100644
--- a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerLoginCommand.java
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerLoginCommand.java
@@ -1,21 +1,26 @@
 package com.tw.go.task.dockerpipeline;
 
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.ConfigVars;
 import com.tw.go.plugin.common.Context;
+import com.tw.go.plugin.common.AbstractCommand;
 
 public class DockerLoginCommand extends DockerCommand
 {
-    public DockerLoginCommand(Context taskContext, Config taskConfig)
+
+    public DockerLoginCommand(JobConsoleLogger console, ConfigVars configVars)
     {
+        super(console, configVars);
+
         add("docker");
         add("login");
-        add("--username=" + taskConfig.registryUsername);
-        add("--password=" + taskConfig.registryPassword);
+        add("--username");
+        add(configVars.getValue(DockerTask.REGISTRY_USERNAME));
+        add("--password");
+        add(configVars.getValue(DockerTask.REGISTRY_PASSWORD));
 
-        if(!(taskConfig.registryEmail.isEmpty()))
-        {
-            add("--email=" + taskConfig.registryEmail);
+        if (!configVars.isEmpty(DockerTask.REGISTRY_URL_FOR_LOGIN)) {
+            add(configVars.getValue(DockerTask.REGISTRY_URL_FOR_LOGIN));
         }
-
-        add(taskConfig.registryUrlForLogin);
     }
 }
\ No newline at end of file
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerMultipleCommand.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerMultipleCommand.java
old mode 100644
new mode 100755
index 3470fb3..cebbc4f
--- a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerMultipleCommand.java
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerMultipleCommand.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import com.tw.go.plugin.common.ICommand;
 
 public abstract class DockerMultipleCommand implements ICommand
 {
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerPushCommand.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerPushCommand.java
old mode 100644
new mode 100755
index 18824a0..2d3ea59
--- a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerPushCommand.java
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerPushCommand.java
@@ -1,14 +1,16 @@
 package com.tw.go.task.dockerpipeline;
 
-import com.tw.go.plugin.common.Context;
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.ConfigVars;
 
 /**
  * Created by BradeaC on 21/12/2015.
  */
 public class DockerPushCommand extends DockerCommand
 {
-    public DockerPushCommand(Context taskContext, Config taskConfig, String tag)
+    public DockerPushCommand(JobConsoleLogger console, ConfigVars configVars, String tag)
     {
+        super(console, configVars);
         command.add("docker");
         command.add("push");
         command.add(tag);
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRemoveAllContainers.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRemoveAllContainers.java
old mode 100644
new mode 100755
index dc1c85f..36d5db5
--- a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRemoveAllContainers.java
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRemoveAllContainers.java
@@ -1,16 +1,32 @@
 package com.tw.go.task.dockerpipeline;
 
-import com.tw.go.plugin.common.Context;
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+
+import com.tw.go.plugin.common.ConfigVars;
+import com.tw.go.plugin.common.AbstractCommand;
+
+import java.util.List;
 
 /**
  * Created by BradeaC on 13/04/2016.
  */
-public class DockerRemoveAllContainers extends DockerCommand
-{
-    public DockerRemoveAllContainers(Context taskContext, Config taskConfig)
-    {
-        command.add("/bin/sh");
-        command.add("-c");
-        command.add("test -n \"$(docker ps -a -q)\" && docker rm -f $(docker ps -a -q) || echo \"No containers to delete\"");
+public class DockerRemoveAllContainers extends AbstractCommand {
+    public DockerRemoveAllContainers(JobConsoleLogger console, ConfigVars configVars) {
+        super(console);
+    }
+
+    @Override
+    public void run() throws Exception {
+
+        List<String> ids = DockerEngine.getIds(new String[]{"docker", "ps", "-a", "-q", "-f"});
+
+        if (ids.size() > 0) {
+            add("docker");
+            add("rm");
+            for (String s : ids) {
+                add(s);
+            }
+            super.run();
+        }
     }
 }
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRemoveAllImages.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRemoveAllImages.java
old mode 100644
new mode 100755
index 6be524c..7a33874
--- a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRemoveAllImages.java
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRemoveAllImages.java
@@ -1,16 +1,27 @@
 package com.tw.go.task.dockerpipeline;
 
-import com.tw.go.plugin.common.Context;
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.AbstractCommand;
+import com.tw.go.plugin.common.ConfigVars;
+import java.util.List;
 
-/**
- * Created by BradeaC on 13/04/2016.
- */
-public class DockerRemoveAllImages extends DockerCommand
-{
-    public DockerRemoveAllImages(Context taskContext, Config taskConfig)
-    {
-        command.add("/bin/sh");
-        command.add("-c");
-        command.add("test -n \"$(docker images -q)\" && docker rmi -f $(docker images -q) || echo \"No images to delete\"");
+public class DockerRemoveAllImages extends AbstractCommand {
+    public DockerRemoveAllImages(JobConsoleLogger console, ConfigVars configVars) {
+        super(console);
     }
-}
+
+    @Override
+    public void run() throws Exception {
+        List<String> ids = DockerEngine.getIds(new String[]{"docker", "images", "-q"});
+
+        if (ids.size() > 0) {
+            add("docker");
+            add("rmi");
+            add("-f");
+            for (String s : ids) {
+                add(s);
+            }
+            super.run();
+        }
+    }
+}
\ No newline at end of file
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRemoveDanglingImages.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRemoveDanglingImages.java
new file mode 100755
index 0000000..860786b
--- /dev/null
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRemoveDanglingImages.java
@@ -0,0 +1,29 @@
+package com.tw.go.task.dockerpipeline;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.AbstractCommand;
+import com.tw.go.plugin.common.ConfigVars;
+
+import java.util.List;
+
+public class DockerRemoveDanglingImages extends AbstractCommand {
+    public DockerRemoveDanglingImages(JobConsoleLogger console, ConfigVars configVars) {
+        super(console);
+    }
+
+    @Override
+    public void run() throws Exception {
+
+        List<String> ids = DockerEngine.getIds(new String[]{"docker", "images", "-f", "dangling=true", "-q"});
+
+        if (ids.size() > 0) {
+            add("docker");
+            add("rmi");
+            add("-f");
+            for (String s : ids) {
+                add(s);
+            }
+            super.run();
+        }
+    }
+}
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRemoveExitedContainers.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRemoveExitedContainers.java
new file mode 100755
index 0000000..76f0447
--- /dev/null
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRemoveExitedContainers.java
@@ -0,0 +1,28 @@
+package com.tw.go.task.dockerpipeline;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.AbstractCommand;
+import com.tw.go.plugin.common.ConfigVars;
+
+import java.util.List;
+
+public class DockerRemoveExitedContainers extends AbstractCommand {
+    public DockerRemoveExitedContainers (JobConsoleLogger console, ConfigVars configVars) {
+        super(console);
+    }
+
+    @Override
+    public void run() throws Exception {
+
+        List<String> ids = DockerEngine.getIds(new String[]{"docker", "ps", "-a", "-q", "-f", "status=exited"});
+
+        if (ids.size() > 0) {
+            add("docker");
+            add("rm");
+            for (String s : ids) {
+                add(s);
+            }
+            super.run();
+        }
+    }
+}
\ No newline at end of file
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRestartCommand.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRestartCommand.java
old mode 100644
new mode 100755
index 1b5315f..d0f0d74
--- a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRestartCommand.java
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRestartCommand.java
@@ -1,17 +1,18 @@
 package com.tw.go.task.dockerpipeline;
 
-import com.tw.go.plugin.common.Context;
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.AbstractCommand;
+import com.tw.go.plugin.common.ConfigVars;
 
-/**
- * Created by BradeaC on 13/04/2016.
- */
-public class DockerRestartCommand extends DockerCommand
+public class DockerRestartCommand extends AbstractCommand
 {
-    public DockerRestartCommand(Context taskContext, Config taskConfig)
+    public DockerRestartCommand(JobConsoleLogger console, ConfigVars configVars)
     {
-        command.add("sudo");
-        command.add("service");
-        command.add("docker");
-        command.add("restart");
+        super(console);
+
+        add("sudo");
+        add("service");
+        add("docker");
+        add("restart");
     }
 }
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRmCommand.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRmCommand.java
new file mode 100644
index 0000000..33d77fa
--- /dev/null
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRmCommand.java
@@ -0,0 +1,16 @@
+package com.tw.go.task.dockerpipeline;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.ConfigVars;
+
+public class DockerRmCommand extends DockerCommand
+{
+
+    public DockerRmCommand(JobConsoleLogger console, ConfigVars configVars, String id)
+    {
+        super(console, configVars);
+        add("docker");
+        add("rm");
+        add(id);
+    }
+}
\ No newline at end of file
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRun2Command.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRun2Command.java
new file mode 100644
index 0000000..d633015
--- /dev/null
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRun2Command.java
@@ -0,0 +1,60 @@
+package com.tw.go.task.dockerpipeline;
+
+import com.thoughtworks.go.plugin.api.logging.Logger;
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.AbstractCommand;
+import com.tw.go.plugin.common.ConfigVars;
+import com.tw.go.plugin.common.ListUtil;
+
+import java.nio.file.InvalidPathException;
+import java.nio.file.Paths;
+
+public class DockerRun2Command extends DockerCommand {
+
+    private final Logger logger = Logger.getLoggerFor(DockerRun2Command.class);
+    ConfigVars configVars;
+
+    public DockerRun2Command(JobConsoleLogger console, ConfigVars configVars) throws Exception {
+        super(console, configVars);
+        this.configVars = configVars;
+    }
+
+    @Override
+    public void run() throws Exception {
+        DockerCreateCommand cmd = new DockerCreateCommand(console, configVars);
+        cmd.run();
+        if (cmd.isSuccessful()) {
+            //String id = cmd.getProcessOutput().getStdOut().get(0);
+            String id = cmd.getContainerName(); // tmp<.....>
+            logger.info(String.format("We think the container's name is %s", id));
+
+            if (!configVars.isEmpty(DockerTask.RUN_PRE_COPY_TO)) {
+                String hostDir = makeHostDir(getAbsoluteWorkingDir(), configVars.getValue(DockerTask.RUN_PRE_COPY_FROM));
+                logger.info(String.format("Copying FROM %s",hostDir));
+                new DockerCpCommand(console, configVars, hostDir, id + ":" + configVars.getValue(DockerTask.RUN_PRE_COPY_TO))
+                        .run();
+            }
+
+            new DockerStartCommand(console, configVars, id)
+                    .run();
+
+            if (!configVars.isEmpty(DockerTask.RUN_POST_COPY_FROM)) {
+                String hostDir = makeHostDir(getAbsoluteWorkingDir(), configVars.getValue(DockerTask.RUN_POST_COPY_TO));
+                logger.info(String.format("Copying TO %s",hostDir));
+                new DockerCpCommand(console, configVars, id + ":" + configVars.getValue(DockerTask.RUN_POST_COPY_FROM), hostDir)
+                        .run();
+            }
+
+            new DockerRmCommand(console, configVars, id)
+                    .run();
+        }
+    }
+
+    String makeHostDir(String workingDir, String relative) throws Exception {
+        String relativePath = Paths.get(workingDir,relative).normalize().toAbsolutePath().toString();
+        if (!relativePath.startsWith(workingDir)) {
+            throw new Exception("Trying to escape working directory");
+        }
+        return  relativePath;
+    }
+}
\ No newline at end of file
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRunCommand.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRunCommand.java
new file mode 100755
index 0000000..a01dad4
--- /dev/null
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerRunCommand.java
@@ -0,0 +1,64 @@
+package com.tw.go.task.dockerpipeline;
+
+import com.thoughtworks.go.plugin.api.logging.Logger;
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.AbstractCommand;
+import com.tw.go.plugin.common.ConfigVars;
+import com.tw.go.plugin.common.ListUtil;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+
+public class DockerRunCommand extends DockerCommand {
+
+    private final Logger logger = Logger.getLoggerFor(DockerRunCommand.class);
+
+    public DockerRunCommand(JobConsoleLogger console, ConfigVars configVars) throws Exception {
+        super(console, configVars);
+        add("docker");
+        add("run");
+        add("--rm");
+
+        String id = getContainerID(console, configVars);
+        String workingDir = getAbsoluteWorkingDir();
+        if (id != null) {
+            logger.info(String.format("Running inside container '%s'. Using '--volume-from' with working directory set to '%s'", id, workingDir));
+            // todo: check, if the container provides access to the actual pipeline directory
+            // e.g. "/var/lib/go-agent" ..
+            add("--volumes-from");
+            add(id);
+        } else {
+            logger.info(String.format("(Most likely) NOT running in container. Using '--volume' with working directory set to '%s'", workingDir));
+            add("--volume");
+            add(workingDir + ":" + workingDir);
+        }
+
+        add("--workdir");
+        add(workingDir);
+
+        addRunEnvVars(configVars.getValue(DockerTask.RUN_ENV_VARS));
+
+        add(configVars.getValue(DockerTask.RUN_IMAGE));
+        for (String arg : splitArgs(configVars.getValue(DockerTask.RUN_ARGS))) {
+            add(arg);
+        }
+    }
+
+    protected void addRunEnvVars(String envVars) {
+        for (String envVar : ListUtil.splitByFirstOrDefault(envVars, ';')) {
+            if (!envVar.isEmpty()) {
+                command.add("-e");
+                command.add(envVar);
+            }
+        }
+    }
+
+    protected String getContainerID(JobConsoleLogger console, ConfigVars configVars) throws Exception {
+        AbstractCommand cmd = new DockerContainerIdCommand(console, configVars)
+                .disableConsoleOutput();
+        cmd.run();
+        return DockerContainerIdCommand.extractId(cmd.getProcessOutput());
+    }
+
+}
\ No newline at end of file
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerStartCommand.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerStartCommand.java
new file mode 100644
index 0000000..894d9d8
--- /dev/null
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerStartCommand.java
@@ -0,0 +1,17 @@
+package com.tw.go.task.dockerpipeline;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.ConfigVars;
+
+public class DockerStartCommand extends DockerCommand
+{
+
+    public DockerStartCommand(JobConsoleLogger console, ConfigVars configVars, String id)
+    {
+        super(console, configVars);
+        add("docker");
+        add("start");
+        add("-a");
+        add(id);
+    }
+}
\ No newline at end of file
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerStopContainers.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerStopContainers.java
old mode 100644
new mode 100755
index ef01a4a..5f82b40
--- a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerStopContainers.java
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerStopContainers.java
@@ -1,16 +1,27 @@
 package com.tw.go.task.dockerpipeline;
 
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.AbstractCommand;
+import com.tw.go.plugin.common.ConfigVars;
 import com.tw.go.plugin.common.Context;
 
-/**
- * Created by BradeaC on 13/04/2016.
- */
-public class DockerStopContainers extends DockerCommand
-{
-    public DockerStopContainers(Context taskContext, Config taskConfig)
-    {
-        command.add("/bin/sh");
-        command.add("-c");
-        command.add("test -n \"$(docker ps -a -q)\" && docker stop $(docker ps -a -q) || echo \"No containers to stop\"");
-    }
+import java.util.List;
+
+public class DockerStopContainers extends AbstractCommand {
+
+    public DockerStopContainers(JobConsoleLogger console, ConfigVars configVars) { super(console); }
+        @Override
+        public void run ()throws Exception {
+            List<String> ids = DockerEngine.getIds(new String[]{"docker", "ps", "-a", "-q"});
+
+            if (ids.size() > 0) {
+                add("docker");
+                add("stop");
+                for (String s : ids) {
+                    add(s);
+                }
+
+                super.run();
+            }
+        }
 }
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerTask.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerTask.java
old mode 100644
new mode 100755
index dcf661c..19bb669
--- a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerTask.java
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerTask.java
@@ -1,38 +1,29 @@
 package com.tw.go.task.dockerpipeline;
 
-import java.util.*;
 import com.google.gson.GsonBuilder;
-import com.thoughtworks.go.plugin.api.GoApplicationAccessor;
 import com.thoughtworks.go.plugin.api.GoPluginIdentifier;
 import com.thoughtworks.go.plugin.api.annotation.Extension;
-import com.thoughtworks.go.plugin.api.exceptions.UnhandledRequestTypeException;
 import com.thoughtworks.go.plugin.api.logging.Logger;
 import com.thoughtworks.go.plugin.api.request.GoPluginApiRequest;
 import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
-import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
-import com.tw.go.plugin.common.Context;
-import com.tw.go.plugin.common.Result;
-import org.apache.commons.io.IOUtils;
-import com.tw.go.plugin.common.BaseGoPlugin;
-import com.tw.go.plugin.common.ConfigDef;
-import com.tw.go.plugin.common.ConfigDef.Required;
-import com.tw.go.plugin.common.ConfigDef.Secure;
+import com.tw.go.plugin.common.*;;
 
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
 @Extension
-public class DockerTask extends BaseGoPlugin
-{
-    public static final String CLEAN_BEFORE_TASK = "CleanBeforeTask";
-
+public class DockerTask extends BaseGoPlugin {
     public static final String IMAGE_NAME = "ImageName";
     public static final String DOCKER_FILE_NAME = "DockerFileName";
+    public static final String BUILD_MICROLABELING = "BUILD_MICROLABELING";
     public static final String BUILD_ARGS = "BuildArgs";
+    public static final String BUILD_NO_CACHE = "BUILD_NO_CACHE";
+    public static final String PUSH_IMAGES = "isPush";
 
     public static final String USERNAME = "Username";
     public static final String IMAGE_TAG = "ImageTag";
+    public static final String IMAGE_TAG_POSTFIX = "IMAGE_TAG_POSTFIX";
 
     public static final String REGISTRY_USERNAME = "RegistryUsername";
     public static final String REGISTRY_PASSWORD = "RegistryPassword";
@@ -40,55 +31,47 @@ public class DockerTask extends BaseGoPlugin
     public static final String REGISTRY_EMAIL = "RegistryEmail";
     public static final String REGISTRY_URL_FOR_LOGIN = "RegistryURLForLogin";
 
-    public static final String CLEAN_AFTER_TASK = "CleanAfterTask";
+    public static final String RUN_IMAGE = "RUN_IMAGE";
+    public static final String RUN_ENV_VARS = "RUN_ENV_VARS";
+    public static final String RUN_CONTAINER_IDS = "RUN_CONTAINER_IDS";
+    public static final String RUN_PRE_COPY_FROM = "RUN_PRE_COPY_FROM";
+    public static final String RUN_PRE_COPY_TO = "RUN_PRE_COPY_TO";
+    public static final String RUN_POST_COPY_FROM = "RUN_POST_COPY_FROM";
+    public static final String RUN_POST_COPY_TO = "RUN_POST_COPY_TO";
+    //    public static final String RUN_VOLUMES_FROM = "RUN_VOLUMES_FROM";
+//    public static final String RUN_VOLUME = "RUN_VOLUME";
+//    public static final String RUN_WORKING_DIR = "RUN_WORKING_DIR";
+    public static final String RUN_ARGS = "RUN_ARGS";
+
+    public static final String CLEAN_BEFORE_TASK = "CleanBeforeTask";
+    public static final String CLEAN_AFTER_TASK = "CleanAfterComplete";
 
     private static final Logger LOGGER = Logger.getLoggerFor(DockerTask.class);
 
-    @Override
-    public void initializeGoApplicationAccessor(GoApplicationAccessor goApplicationAccessor)
-    {
-        //shouldn't be
-        //implemented
+    public DockerTask() {
     }
 
     @Override
-    protected GoPluginApiResponse handleTaskView(GoPluginApiRequest request)
-    {
-        HashMap result = new HashMap();
-        result.put("displayValue", "Docker pipeline plugin");
-
-        try
-        {
-            result.put("template", IOUtils.toString(getClass().getResourceAsStream("/views/task.template.html"), "UTF-8"));
-            return success(result);
-        }
-        catch (Exception e)
-        {
-            String errorMessage = "Failed to find template: " + e.getMessage();
-            result.put("exception", errorMessage);
-
-            LOGGER.error(errorMessage, e);
-
-            return internalError(result);
-        }
+    protected GoPluginApiResponse handleTaskView(GoPluginApiRequest request) {
+        return getViewResponse("Docker",
+                getClass().getResourceAsStream("/views/task.template.html"));
     }
 
+    // https://developer.go.cd/current/writing_go_plugins/task/version_1_0/execute.html
     @Override
-    protected GoPluginApiResponse handleTaskExecution(GoPluginApiRequest request)
-    {
-        JobConsoleLogger console = JobConsoleLogger.getConsoleLogger();
-
+    protected GoPluginApiResponse handleTaskExecution(GoPluginApiRequest request) {
         Map executionRequest = (Map) new GsonBuilder().create().fromJson(request.requestBody(), Object.class);
+
         Map<String, Map> config = (Map) executionRequest.get("config");
-        Context context = new Context((Map) executionRequest.get("context"));
-        Map<String, String> envVars = context.getEnvironmentVariables();
-        DockerTaskExecutor executor = new DockerTaskExecutor(console, context, config);
 
-        ArrayList<String> secure = getConfigSecureList();
+        fixConfigAttrs(config,getConfigDef());
 
-        ConfigVars configVars = new ConfigVars(config, envVars, secure);
+        Context context = new Context((Map) executionRequest.get("context"));
+
+        Map<String, String> envVars = context.getEnvironmentVariables();
 
-        Result result = executor.execute(configVars);
+        DockerTaskExecutor executor = new DockerTaskExecutor(
+                MaskingJobConsoleLogger.getConsoleLogger(), context, config);
 
         // The RESPONSE_CODE MUST be 200 (SUCCESS) to be processed by Go.CD
         // The outcome is defined by the property "success", and the cause can be stored in "message"
@@ -97,69 +80,77 @@ protected GoPluginApiResponse handleTaskExecution(GoPluginApiRequest request)
         // in
         //  .../gocd/plugin-infra/go-plugin-access/src/com/thoughtworks/go/plugin/access/PluginRequestHelper.java
 
-        return success(result.toMap());
+        try {
+            Result result = executor.execute();
+            return success(result.toMap());
+        } catch (Exception e) {
+            Result result = new Result(false,e.getMessage());
+            return success(result.toMap());
+        }
+
     }
 
     @Override
-    protected GoPluginApiResponse handleValidation(GoPluginApiRequest request)
-    {
+    protected GoPluginApiResponse handleValidation(GoPluginApiRequest request) {
         HashMap result = new HashMap();
         return success(result);
     }
 
     @Override
-    protected GoPluginApiResponse handleGetConfigRequest(GoPluginApiRequest request)
-    {
+    protected GoPluginApiResponse handleGetConfigRequest(GoPluginApiRequest request) {
         return success(getConfigDef());
     }
 
-    private ArrayList getConfigSecureList()
-    {
-        ArrayList<String> secure = new ArrayList<>();
-        Map<String, Map> configDef = getConfigDef();
-
-        for (Map.Entry<String, Map> entry : configDef.entrySet())
-        {
-            Map cfg = entry.getValue();
-
-            if ((boolean) cfg.get("secure"))
-            {
-                secure.add(entry.getKey());
-            }
+    private void fixConfigAttrs(Map<String, Map> configAct, Map<String, Map> configDef) {
+        for (Map.Entry<String,Map> e : configAct.entrySet()) {
+            Map def = configDef.get(e.getKey());
+            Map act = e.getValue();
+            act.put("required",def.get("required"));
+            act.put("secure",def.get("secure"));
         }
-
-        return secure;
     }
 
-    private Map getConfigDef()
-    {
+    private Map getConfigDef() {
         return new ConfigDef()
                 // cleaning ...
-                .add(CLEAN_AFTER_TASK, "true", Required.No)
-                .add(CLEAN_BEFORE_TASK, "false", Required.No)
+                .add(CLEAN_AFTER_TASK, "false", Required.NO)
 
                 // build
-                .add(DOCKER_FILE_NAME, "", Required.No)
-                .add(BUILD_ARGS, "", Required.No)
-                .add(IMAGE_NAME, "", Required.Yes)
+                .add(DOCKER_FILE_NAME, "", Required.NO)
+                .add(BUILD_MICROLABELING, "false", Required.NO)
+                .add(BUILD_ARGS, "", Required.NO)
+                .add(BUILD_NO_CACHE, "false", Required.NO)
+                .add(IMAGE_NAME, "", Required.NO)
 
                 // tag
-                .add(IMAGE_TAG, "", Required.Yes)
-                .add(USERNAME, "", Required.No)
+                .add(IMAGE_TAG, "", Required.NO)
+                .add(IMAGE_TAG_POSTFIX, "", Required.NO)
+                .add(USERNAME, "", Required.NO)
 
                 // login
-                .add(REGISTRY_URL_FOR_LOGIN, "", Required.Yes)
-                .add(REGISTRY_USERNAME, "", Required.No)
-                .add(REGISTRY_PASSWORD, "", Required.No, Secure.Yes)
-                .add(REGISTRY_EMAIL, "", Required.No)
+                .add(REGISTRY_URL_FOR_LOGIN, "", Required.NO)
+                .add(REGISTRY_USERNAME, "", Required.NO)
+                .add(REGISTRY_PASSWORD, "", Required.NO, Secure.YES)
+                .add(PUSH_IMAGES, "true", Required.NO)
+
+                // run
+                .add(RUN_IMAGE, "", Required.NO)
+                .add(RUN_ENV_VARS, "", Required.NO)
+                .add(RUN_PRE_COPY_FROM, "", Required.NO)
+                .add(RUN_PRE_COPY_TO, "", Required.NO)
+                .add(RUN_POST_COPY_FROM, "", Required.NO)
+                .add(RUN_POST_COPY_TO, "", Required.NO)
+//                .add(RUN_VOLUME, "", Required.No)
+//                .add(RUN_VOLUMES_FROM, "", Required.No)
+//                .add(RUN_WORKING_DIR, "", Required.No)
+                .add(RUN_ARGS, "", Required.NO)
 
                 //
                 .toMap();
     }
 
     @Override
-    public GoPluginIdentifier pluginIdentifier()
-    {
+    public GoPluginIdentifier pluginIdentifier() {
         return new GoPluginIdentifier("task", Arrays.asList("1.0"));
     }
 }
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerTaskExecutor.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerTaskExecutor.java
old mode 100644
new mode 100755
index 4c922a2..03fe002
--- a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerTaskExecutor.java
+++ b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/DockerTaskExecutor.java
@@ -1,79 +1,148 @@
 package com.tw.go.task.dockerpipeline;
 
+import com.thoughtworks.go.plugin.api.logging.Logger;
 import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
-import com.tw.go.plugin.common.Context;
-import com.tw.go.plugin.common.Result;
-import com.tw.go.plugin.common.TaskExecutor;
+import com.tw.go.plugin.common.*;
+import org.json.JSONArray;
+import org.json.JSONObject;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
+import java.security.GeneralSecurityException;
 import java.util.Map;
 
-public class DockerTaskExecutor extends TaskExecutor
-{
-    public DockerTaskExecutor(JobConsoleLogger console, Context context, Map config)
-    {
+public class DockerTaskExecutor extends TaskExecutor {
+    private final Logger logger = Logger.getLoggerFor(DockerTaskExecutor.class);
+
+    public DockerTaskExecutor(JobConsoleLogger console, Context context, Map config) {
         super(console, context, config);
     }
 
-    public Result execute (ConfigVars configVars)
-    {
-        try
-        {
-            configVars.printConfig(console, getPluginLogPrefix());
-            DockerCommand.setConfigVars(configVars);
-            return runCommand(new Config(configVars));
-        }
-        catch (Exception e)
-        {
-            return new Result(false, "Failed while running the task", e);
+    public Result execute() throws Exception {
+        try {
+            return runCommand();
+        } catch (Exception e) {
+            logException(logger,e);
+            return new Result(false, getPluginLogPrefix() + e.getMessage(), e);
         }
     }
 
-    public Result runCommand (Config taskConfig) throws Exception
-    {
-        try
-        {
-            DockerCommand.setPrefix(getPluginLogPrefix());
-
-            if (taskConfig.cleanBeforeTask)
-            {
-                ICommand cmd = new DockerCleanBefore(context, taskConfig);
-                cmd.run();
+    public Result runCommand() throws Exception {
+        try {
+            if(configVars.isChecked(DockerTask.CLEAN_BEFORE_TASK)) {
+                new DockerRestartCommand(console, configVars)
+                        .run();
+                new DockerStopContainers(console, configVars)
+                        .run();
+                new DockerRemoveAllContainers(console, configVars)
+                        .run();
+                new DockerRemoveAllImages(console, configVars)
+                        .run();
             }
-
-            if (!(taskConfig.registryUsername.toString().isEmpty()) && !(taskConfig.registryPassword.toString().isEmpty()))
-            {
-                ICommand cmd = new DockerLoginCommand(context, taskConfig);
-                cmd.run();
+            if (!configVars.isEmpty(DockerTask.REGISTRY_USERNAME) && !configVars.isEmpty(DockerTask.REGISTRY_PASSWORD)) {
+                new DockerLoginCommand(console, configVars)
+                        .run();
             }
 
-            DockerBuildCommand build = new DockerBuildCommand(context, taskConfig);
-            build.run();
+            if (!configVars.isEmpty(DockerTask.IMAGE_TAG)) {
+                DockerBuildCommand build;
+
+                if (configVars.isChecked(DockerTask.BUILD_MICROLABELING))
+                    build = new DockerBuildCommand(console, configVars, getRepositoryUrl());
+                else
+                    build = new DockerBuildCommand(console, configVars, "");
+
+                build.run();
 
-            for (String tag : build.imageAndTag)
-            {
-                if (tag != null)
-                {
-                    ICommand cmd = new DockerPushCommand(context, taskConfig, tag);
-                    cmd.run();
+                if (configVars.isChecked(DockerTask.PUSH_IMAGES)) {
+                    for (String tag : build.imageAndTag) {
+                        if (tag != null) {
+                            new DockerPushCommand(console, configVars, tag)
+                                    .run();
+                        }
+                    }
                 }
             }
-        }
 
-        finally
-        {
-            if (taskConfig.cleanAfterTask)
-            {
-                ICommand cmd = new DockerRemoveAllImages(context, taskConfig);
-                cmd.run();
+            if (!configVars.isEmpty(DockerTask.RUN_IMAGE)) {
+                new DockerRun2Command(console, configVars)
+                        .run();
+            }
+        } finally {
+            if (configVars.isChecked(DockerTask.CLEAN_AFTER_TASK)) {
+                new DockerStopContainers(console, configVars)
+                        .run();
+                new DockerRemoveAllContainers(console, configVars)
+                        .run();
+                new DockerRemoveAllImages(console, configVars)
+                        .run();
+            }
+
+            if (configVars.isChecked(DockerTask.CLEAN_AFTER_TASK)) {
+                // http://blog.yohanliyanage.com/2015/05/docker-clean-up-after-yourself/
+                new DockerRemoveExitedContainers(console, configVars)
+                        .run();
+                new DockerRemoveDanglingImages(console, configVars)
+                        .run();
             }
         }
 
         return new Result(true, "Finished");
     }
 
+    private String getRepositoryUrl() throws GeneralSecurityException {
+        Map envVars = context.getEnvironmentVariables();
+        GoApiClient client = new GoApiClient(envVars.get(GoApiConstants.ENVVAR_NAME_GO_SERVER_URL).toString());
+        try {
+            // get go build user authorization
+            if (envVars.get(GoApiConstants.ENVVAR_NAME_GO_BUILD_USER) != null &&
+                    envVars.get(GoApiConstants.ENVVAR_NAME_GO_BUILD_USER_PASSWORD) != null) {
+
+                client.setBasicAuthentication(envVars.get(GoApiConstants.ENVVAR_NAME_GO_BUILD_USER).toString(), envVars.get(GoApiConstants.ENVVAR_NAME_GO_BUILD_USER_PASSWORD).toString());
+
+                log("Logged in as '" + envVars.get(GoApiConstants.ENVVAR_NAME_GO_BUILD_USER).toString() + "'");
+
+                Map response = client.getPipelineConfig(envVars.get
+                                (GoApiConstants.ENVVAR_NAME_GO_PIPELINE_NAME).toString(),
+                                envVars.get(GoApiConstants.ENVVAR_NAME_GO_PIPELINE_COUNTER).toString());
+
+                //log("respose" + response);
+
+                JSONObject objResult = new JSONObject(response);
+                //log("objResult" + objResult);
+                JSONObject build_cause = objResult.getJSONObject("build_cause");
+                //log("build_case" + build_cause);
+                JSONArray material_revisions = build_cause.getJSONArray("material_revisions");
+                //log("material_revisions" + material_revisions);
+                JSONObject materialFirst = material_revisions.getJSONObject(0);
+                //log("materialfirst" + materialFirst);
+                JSONObject material = materialFirst.getJSONObject("material");
+                //log("material" + material);
+                String url = material.getString("description");
+                //log("url" + url);
+
+                if (url.contains("@")) {
+                    String result = "http://" + url.substring(url.indexOf("@") + 1, url.indexOf(','));
+                    return result;
+                }
+                else {
+                    String result = "http://" + url.substring(url.indexOf("//") + 1, url.indexOf(','));
+                    return result;
+                }
+
+            } else {
+                log("No login set. Cannot access go.cd API !");
+            }
+        }
+        catch(Exception e) {
+            log(e.toString());
+        }
+        return null;
+    }
+
     @Override
-    protected String getPluginLogPrefix()
-    {
+    protected String getPluginLogPrefix() {
         return "[Docker] ";
     }
 }
diff --git a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/ICommand.java b/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/ICommand.java
deleted file mode 100644
index 55af3be..0000000
--- a/docker-pipeline-plugin/src/com/tw/go/task/dockerpipeline/ICommand.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.tw.go.task.dockerpipeline;
-
-
-/**
- * Created by BradeaC on 16/12/2015.
- */
-public interface ICommand
-{
-    void run() throws Exception;
-}
diff --git a/docker-pipeline-plugin/test/DockerBuildCommandTest.java b/docker-pipeline-plugin/test/DockerBuildCommandTest.java
new file mode 100644
index 0000000..c75ea60
--- /dev/null
+++ b/docker-pipeline-plugin/test/DockerBuildCommandTest.java
@@ -0,0 +1,92 @@
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.ConfigVars;
+import com.tw.go.task.dockerpipeline.DockerBuildCommand;
+import com.tw.go.task.dockerpipeline.DockerTask;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+public class DockerBuildCommandTest {
+
+    DockerBuildCommand buildCommand;
+    ConfigVars configVars = Mockito.mock(ConfigVars.class);
+
+    static List<String> command;
+
+    @Before
+    public void init() {
+
+        Mockito.when(configVars.getValue(DockerTask.IMAGE_NAME)).thenReturn("imagename");
+        Mockito.when(configVars.getValue(DockerTask.DOCKER_FILE_NAME)).thenReturn("dockerfilename");
+        Mockito.when(configVars.getValue(DockerTask.USERNAME)).thenReturn("username");
+        Mockito.when(configVars.getValue(DockerTask.IMAGE_TAG)).thenReturn("imagetag");
+        Mockito.when(configVars.getValue(DockerTask.REGISTRY_USERNAME)).thenReturn("registryusername");
+        Mockito.when(configVars.getValue(DockerTask.REGISTRY_PASSWORD)).thenReturn("registrypassword");
+        Mockito.when(configVars.getValue(DockerTask.REGISTRY_URL_FOR_LOGIN)).thenReturn("registry.example.io");
+        Mockito.when(configVars.getValue(DockerTask.BUILD_ARGS)).thenReturn("buildargs");
+        Mockito.when(configVars.getValue(DockerTask.IMAGE_TAG_POSTFIX)).thenReturn("postfix");
+
+        buildCommand = new DockerBuildCommand(Mockito.mock(JobConsoleLogger.class), configVars);
+
+        command = new ArrayList();
+        command.add("docker");
+        command.add("build");
+        command.add("--pull=true");
+        command.add("--force-rm");
+        command.add("-f");
+        command.add(buildCommand.getDockerfileAbsolutePath(configVars));
+        command.add("--build-arg");
+        command.add("buildargs");
+        command.add("-t");
+        command.add(configVars.getValue(DockerTask.REGISTRY_URL_FOR_LOGIN) + "/" + configVars.getValue(DockerTask.USERNAME)
+                + "/" + configVars.getValue(DockerTask.IMAGE_NAME) + ":" + configVars.getValue(DockerTask.IMAGE_TAG)
+                + "-" + configVars.getValue(DockerTask.IMAGE_TAG_POSTFIX));
+    }
+
+    @Test
+    public void testGetUsername() {
+        assertEquals(buildCommand.getUsername(configVars), configVars.getValue(DockerTask.USERNAME));
+    }
+
+    @Test
+    public void testMakeBaseName() {
+        assertEquals(buildCommand.makeBaseName(configVars.getValue(DockerTask.REGISTRY_URL_FOR_LOGIN),
+                                                configVars.getValue(DockerTask.USERNAME),
+                                                configVars.getValue(DockerTask.IMAGE_NAME)),
+                configVars.getValue(DockerTask.REGISTRY_URL_FOR_LOGIN) + "/"
+                + configVars.getValue(DockerTask.USERNAME) + "/"
+                + configVars.getValue(DockerTask.IMAGE_NAME));
+
+        assertEquals(buildCommand.makeBaseName("", configVars.getValue(DockerTask.USERNAME),
+                                                configVars.getValue(DockerTask.IMAGE_NAME)),
+                configVars.getValue(DockerTask.USERNAME) + "/"
+                        + configVars.getValue(DockerTask.IMAGE_NAME));
+
+        assertEquals(buildCommand.makeBaseName("", "", configVars.getValue(DockerTask.IMAGE_NAME)),
+                configVars.getValue(DockerTask.IMAGE_NAME));
+    }
+
+    @Test
+    public void testGetRegistryName() {
+        assertEquals(buildCommand.getRegistryName(configVars.getValue(DockerTask.REGISTRY_URL_FOR_LOGIN)),
+                configVars.getValue(DockerTask.REGISTRY_URL_FOR_LOGIN));
+    }
+
+    @Test
+    public void testCommandBuildup() {
+        List<String> list = buildCommand.getCommand();
+        list.remove(list.size() - 1);
+
+        assertEquals(buildCommand.getCommand(), command);
+
+        assertEquals(buildCommand.getCommand().contains("docker"), true);
+        assertEquals(buildCommand.getCommand().contains("build"), true);
+        assertEquals(buildCommand.getCommand().contains("-t"), true);
+        assertEquals(buildCommand.getCommand().contains(buildCommand.getDockerfileAbsolutePath(configVars)), true);
+    }
+}
\ No newline at end of file
diff --git a/fetch-any-artifact-plugin/pom.xml b/fetch-any-artifact-plugin/pom.xml
new file mode 100644
index 0000000..a56dd1a
--- /dev/null
+++ b/fetch-any-artifact-plugin/pom.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.thoughtworks.go</groupId>
+    <artifactId>gocd-fetch-any-artifact-plugin</artifactId>
+    <version>1.0.0</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <go.target.version>16.4.0</go.target.version>
+        <go.version>16.4.0</go.version>
+        <plugin.version>${project.version}</plugin.version>
+
+        <sonar.java.coveragePlugin>cobertura</sonar.java.coveragePlugin>
+        <sonar.cobertura.reportPath>target/site/cobertura/coverage.xml</sonar.cobertura.reportPath>
+        <sonar.language>java</sonar.language>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>cd.go.plugin</groupId>
+            <artifactId>go-plugin-api</artifactId>
+            <version>${go.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.thoughtworks.go</groupId>
+            <artifactId>gocd-plugin-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.10.19</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>1.10.19</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <testSourceDirectory>test</testSourceDirectory>
+        <resources>
+            <resource>
+                <directory>resources</directory>
+            </resource>
+        </resources>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <finalName>${project.artifactId}-${project.version}</finalName>
+                    <outputDirectory>../out</outputDirectory>
+                    <archive>
+                        <manifestEntries>
+                            <Go-Version>${go.version}</Go-Version>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}\lib</outputDirectory>
+                            <includeScope>runtime</includeScope>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>false</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <!-- replaces the version number in plugin.xml -->
+                <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>replacer</artifactId>
+                <version>1.5.3</version>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <file>${project.basedir}/target/classes/plugin.xml</file>
+                    <replacements>
+                        <replacement>
+                            <token>GO_TARGET_VERSION_NUMBER</token>
+                            <value>${go.target.version}</value>
+                        </replacement>
+                        <replacement>
+                            <token>PLUGIN_VERSION_NUMBER</token>
+                            <value>${plugin.version}</value>
+                        </replacement>
+                    </replacements>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/fetch-any-artifact-plugin/resources/plugin.xml b/fetch-any-artifact-plugin/resources/plugin.xml
new file mode 100644
index 0000000..01ee766
--- /dev/null
+++ b/fetch-any-artifact-plugin/resources/plugin.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<go-plugin id="fetch-any-artifact.task.plugin" version="1">
+    <about>
+        <name>Fetch Any Artifact Task Plugin</name>
+        <version>0.1</version>
+        <target-go-version>16.4.0</target-go-version>
+        <description>
+           Fetches artifacts by using REST API
+        </description>
+        <vendor>
+            <name>Thomas Schuering</name>
+            <url>https://github.com/thomsch98/gocd-plugins</url>
+        </vendor>
+    </about>
+</go-plugin>
diff --git a/fetch-any-artifact-plugin/resources/views/task.template.html b/fetch-any-artifact-plugin/resources/views/task.template.html
new file mode 100755
index 0000000..b8df2a5
--- /dev/null
+++ b/fetch-any-artifact-plugin/resources/views/task.template.html
@@ -0,0 +1,69 @@
+<!-- <div class="form_item_block">
+    <div class="checkbox_row">
+        <input id="Masking2" type="checkbox" ng-model="Masking2" ng-init="Masking2 = Masking"
+               ng-change="Masking = Masking2" ng-true-value="true" ng-false-value="false">
+        <input id="specifytargets" type="hidden" ng-model="Masking" value="{{Masking}}">
+        <label>Masking
+        </label>
+    </div>
+</div> -->
+<div class="form_item_block">
+    <h1>Prerequisites</h1>
+    This plugin uses the environment variables <b>GO_BUILD_USER</b> and <b>GO_BUILD_USER_PASSWORD</b> to access the go-servers REST API.
+    <a href="https://docs.go.cd/current/faq/dev_use_current_revision_in_build.html">See documentation in GoCD</a>
+</div>
+<div class="form_item_block">
+    <label>Pipeline
+    </label>
+    <input type="text" ng-model="FAA_PIPELINE_NAME">
+    </input>
+    <span class="form_error" ng-show="GOINPUTNAME[FAA_PIPELINE_NAME].$error.server">{{ GOINPUTNAME[FAA_PIPELINE_NAME].$error.server }}</span>
+</div>
+<div class="form_item_block">
+    <label>Stage
+    </label>
+    <input type="text" ng-model="FAA_STAGE_NAME">
+    </input>
+    <span class="form_error" ng-show="GOINPUTNAME[FAA_STAGE_NAME].$error.server">{{ GOINPUTNAME[FAA_STAGE_NAME].$error.server }}</span>
+</div>
+<div class="form_item_block">
+    <label>Job
+    </label>
+    <input type="text" ng-model="FAA_JOB_NAME">
+    </input>
+    <span class="form_error" ng-show="GOINPUTNAME[FAA_JOB_NAME].$error.server">{{ GOINPUTNAME[FAA_JOB_NAME].$error.server }}</span>
+</div>
+<div class="form_item_block">
+    <label>Source<span class="asterisk">*</span>
+    </label>
+    <input type="text" ng-model="FAA_ARTIFACT_SOURCE" ng-required="true">
+    </input>
+    <span class="form_error" ng-show="GOINPUTNAME[FAA_ARTIFACT_SOURCE].$error.server">{{ GOINPUTNAME[FAA_ARTIFACT_SOURCE].$error.server }}</span>
+</div>
+<div class="form_item_block">
+    <div class="checkbox_row">
+        <input id="FAA_ARTIFACT_IS_FILE2" type="checkbox" ng-model="FAA_ARTIFACT_IS_FILE2"
+               ng-init="FAA_ARTIFACT_IS_FILE2 = FAA_ARTIFACT_IS_FILE"
+               ng-change="FAA_ARTIFACT_IS_FILE = FAA_ARTIFACT_IS_FILE2" ng-true-value="true" ng-false-value="false">
+        <input id="specifytargets" type="hidden" ng-model="FAA_ARTIFACT_IS_FILE" value="{{FAA_ARTIFACT_IS_FILE}}">
+        <label>Artifact is file
+        </label>
+    </div>
+</div>
+<div class="form_item_block">
+    <div class="checkbox_row">
+        <input id="FAA_FETCH_IF_FAILED2" type="checkbox" ng-model="FAA_FETCH_IF_FAILED2"
+               ng-init="FAA_FETCH_IF_FAILED2 = FAA_FETCH_IF_FAILED"
+               ng-change="FAA_FETCH_IF_FAILED = FAA_FETCH_IF_FAILED2" ng-true-value="true" ng-false-value="false">
+        <input id="fetchiffailed" type="hidden" ng-model="FAA_FETCH_IF_FAILED" value="{{FAA_FETCH_IF_FAILED}}">
+        <label>Fetch even if failed
+        </label>
+    </div>
+</div>
+<div class="form_item_block">
+    <label>Destination
+    </label>
+    <input type="text" ng-model="FAA_ARTIFACT_DESTINATION">
+    </input>
+    <span class="form_error" ng-show="GOINPUTNAME[FAA_ARTIFACT_DESTINATION].$error.server">{{ GOINPUTNAME[FAA_ARTIFACT_DESTINATION].$error.server }}</span>
+</div>
diff --git a/fetch-any-artifact-plugin/src/com/tw/go/task/fetchanyartifact/FetchAnyArtifactTask.java b/fetch-any-artifact-plugin/src/com/tw/go/task/fetchanyartifact/FetchAnyArtifactTask.java
new file mode 100755
index 0000000..f5d52db
--- /dev/null
+++ b/fetch-any-artifact-plugin/src/com/tw/go/task/fetchanyartifact/FetchAnyArtifactTask.java
@@ -0,0 +1,73 @@
+
+package com.tw.go.task.fetchanyartifact;
+
+import com.thoughtworks.go.plugin.api.GoPluginIdentifier;
+import com.thoughtworks.go.plugin.api.annotation.Extension;
+import com.thoughtworks.go.plugin.api.request.GoPluginApiRequest;
+import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
+import com.tw.go.plugin.common.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+@Extension
+public class FetchAnyArtifactTask extends BaseGoPlugin {
+
+    public final static String FAA_PIPELINE_NAME = "FAA_PIPELINE_NAME";
+    public final static String FAA_ARTIFACT_SOURCE = "FAA_ARTIFACT_SOURCE";
+    public final static String FAA_ARTIFACT_DESTINATION = "FAA_ARTIFACT_DESTINATION";
+    public final static String FAA_STAGE_NAME = "FAA_STAGE_NAME";
+    public final static String FAA_JOB_NAME = "FAA_JOB_NAME";
+    public final static String FAA_ARTIFACT_IS_FILE="FAA_ARTIFACT_IS_FILE";
+    public final static String FAA_FETCH_IF_FAILED="FAA_FETCH_IF_FAILED";
+
+    @Override
+    protected GoPluginApiResponse handleTaskView(GoPluginApiRequest request) {
+        return getViewResponse("Fetch Any Artifact",
+                getClass().getResourceAsStream("/views/task.template.html"));
+    }
+
+    @Override
+    protected GoPluginApiResponse handleValidation(GoPluginApiRequest request) {
+        HashMap result = new HashMap();
+        Map config = (Map) gson.fromJson(request.requestBody(), Object.class);
+        return success(result);
+    }
+
+    @Override
+    protected GoPluginApiResponse handleTaskExecution(GoPluginApiRequest request) {
+        Map executionRequest = (Map) gson.fromJson(request.requestBody(), Object.class);
+
+        Map<String, Map> config = (Map) executionRequest.get("config");
+
+        Context context = new Context((Map) executionRequest.get("context"));
+
+        try {
+            Result result = new FetchAnyArtifactTaskExecutor(
+                    MaskingJobConsoleLogger.getConsoleLogger(), context, config).execute();
+            return success(result.toMap());
+        } catch (Exception e) {
+            Result result = new Result(false,e.getMessage());
+            return success(result.toMap());
+        }
+
+    }
+    @Override
+    protected GoPluginApiResponse handleGetConfigRequest(GoPluginApiRequest request) {
+        return success(new ConfigDef()
+                .add("FAA_PIPELINE_NAME", "", Required.NO)
+                .add("FAA_ARTIFACT_SOURCE", "", Required.YES)
+                .add("FAA_ARTIFACT_DESTINATION", "", Required.NO)
+                .add("FAA_STAGE_NAME", "", Required.NO)
+                .add("FAA_JOB_NAME", "", Required.NO)
+                .add("FAA_ARTIFACT_IS_FILE", "", Required.NO)
+                .add("FAA_FETCH_IF_FAILED", "", Required.NO)
+                .toMap());
+    }
+
+    @Override
+    public GoPluginIdentifier pluginIdentifier() {
+        return new GoPluginIdentifier("task", Arrays.asList("1.0"));
+    }
+}
\ No newline at end of file
diff --git a/fetch-any-artifact-plugin/src/com/tw/go/task/fetchanyartifact/FetchAnyArtifactTaskExecutor.java b/fetch-any-artifact-plugin/src/com/tw/go/task/fetchanyartifact/FetchAnyArtifactTaskExecutor.java
new file mode 100755
index 0000000..b01c0c1
--- /dev/null
+++ b/fetch-any-artifact-plugin/src/com/tw/go/task/fetchanyartifact/FetchAnyArtifactTaskExecutor.java
@@ -0,0 +1,148 @@
+package com.tw.go.task.fetchanyartifact;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.thoughtworks.go.plugin.api.logging.Logger;
+import com.tw.go.plugin.common.*;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Map;
+
+import static com.tw.go.plugin.common.GoApiConstants.*;
+import static com.tw.go.task.fetchanyartifact.FetchAnyArtifactTask.*;
+
+/**
+ * Created by thomassc on 19.05.16.
+ */
+public class FetchAnyArtifactTaskExecutor extends TaskExecutor {
+
+    private final Logger logger = Logger.getLoggerFor(FetchAnyArtifactTaskExecutor.class);
+
+    public FetchAnyArtifactTaskExecutor(JobConsoleLogger console, Context context, Map config) {
+        super(console, context, config);
+    }
+
+    @Override
+    public Result execute() throws Exception {
+        try {
+            return runCommand();
+        } catch (Exception e) {
+            logException(logger,e);
+            return new Result(false, getPluginLogPrefix() + e.getMessage(), e);
+        }
+    }
+
+    public Result runCommand() throws Exception {
+        if (configVars.isEmpty(ENVVAR_NAME_GO_BUILD_USER) ||
+                configVars.isEmpty(ENVVAR_NAME_GO_BUILD_USER_PASSWORD)) {
+            throw new Exception("You must set environment variables '"
+                    + ENVVAR_NAME_GO_BUILD_USER
+                    + "' and '"
+                    + ENVVAR_NAME_GO_BUILD_USER_PASSWORD + "'");
+        }
+
+        GoApiClient apiClient = new GoApiClient(configVars.getValue(ENVVAR_NAME_GO_SERVER_URL));
+
+        apiClient.setBasicAuthentication(
+                configVars.getValue(ENVVAR_NAME_GO_BUILD_USER),
+                configVars.getValue(ENVVAR_NAME_GO_BUILD_USER_PASSWORD));
+
+        String artifact = configVars.getValue(FAA_ARTIFACT_SOURCE);
+        if (!configVars.isChecked(FAA_ARTIFACT_IS_FILE)) {
+            artifact += ".zip";
+        }
+
+        Path absoluteWokingDir = Paths.get(AbstractCommand.getAbsoluteWorkingDir()).normalize().toAbsolutePath();
+        Path targetDir = Paths.get(absoluteWokingDir.toString(), configVars.getValue(FAA_ARTIFACT_DESTINATION)).normalize().toAbsolutePath();
+
+        if (!targetDir.startsWith(absoluteWokingDir)) {
+            throw new Exception("Trying to escape working directory");
+        }
+
+        if (!extractArtifactFromPreviousRun(apiClient, artifact, targetDir.toString())) {
+            console.printLine("No successful pipeline run found (with a valid artifact to retrieve)");
+        } else {
+            console.printLine("Successful pipeline run found (with a valid artifact to retrieve)");
+        }
+            return new Result(true, "Finished");
+    }
+
+    public boolean extractArtifactFromPreviousRun(GoApiClient apiClient, String artifact, String targetDirectory) throws IOException {
+        String pipelineName = configVars.getValue(FAA_PIPELINE_NAME);
+        if (pipelineName.isEmpty()) {
+            pipelineName = configVars.getValue(ENVVAR_NAME_GO_PIPELINE_NAME);
+        }
+        String pipelineStage = configVars.getValue(FAA_STAGE_NAME);
+        if (pipelineStage.isEmpty()) {
+            pipelineStage = configVars.getValue(ENVVAR_NAME_GO_STAGE_NAME);
+        }
+        String pipelineJob = configVars.getValue(FAA_JOB_NAME);
+        if (pipelineJob.isEmpty()) {
+            pipelineJob = configVars.getValue(ENVVAR_NAME_GO_JOB_NAME);
+        }
+
+        console.printLine(String.format("Searching for pipeline run '%s/%s/%s/%s'",pipelineName,pipelineStage,pipelineJob,artifact));
+
+        for (int offset = 0; ; ) {
+            Map history = apiClient.getPipelineHistory(pipelineName, offset);
+            ArrayList pipelines = Selector.select(history, "pipelines");
+            int size = pipelines.size();
+            if (size == 0) {
+                return false;
+            }
+            for (int pidx = 0; pidx < size; pidx++) {
+                Map pipeline = (Map) pipelines.get(pidx);
+                Integer pipelineCounter = Selector.select(pipeline, "counter", 0);
+                ArrayList stages = Selector.select(pipeline, "stages");
+
+                for (int sidx = 0; sidx < stages.size(); sidx++) {
+                    Map stage = (Map) stages.get(sidx);
+                    String stageName = Selector.select(stage, "name");
+                    Integer stageCounter = Integer.parseInt(Selector.select(stage, "counter", "0"));
+
+                    if ("passed".equalsIgnoreCase(Selector.select(stage, "result", "failed")) &&
+                            configVars.isChecked(FAA_FETCH_IF_FAILED)) {
+                        ArrayList jobs = Selector.select(stage, "jobs");
+
+                        for (int jidx = 0; jidx < jobs.size(); jidx++) {
+                            Map job = (Map) jobs.get(jidx);
+                            String jobName = Selector.select(job, "name");
+
+                            if (pipelineStage.equalsIgnoreCase(stageName) &&
+                                    pipelineJob.equalsIgnoreCase(jobName)) {
+
+                                try {
+                                    InputStream input = apiClient.getArtifact(
+                                            pipelineName,
+                                            pipelineCounter.toString(),
+                                            stageName,
+                                            stageCounter.toString(),
+                                            jobName,
+                                            artifact);
+
+                                    UnzipUtil.unzip(input, targetDirectory);
+
+                                    return true;
+
+                                } catch (IOException e) {
+                                    // There is no artifact to be found
+                                    return false;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            offset += size;
+        }
+    }
+
+    @Override
+    protected String getPluginLogPrefix() {
+        return "[FetchAnyArtifact] ";
+    }
+}
\ No newline at end of file
diff --git a/fortify-plugin/pom.xml b/fortify-plugin/pom.xml
new file mode 100755
index 0000000..aa12f0c
--- /dev/null
+++ b/fortify-plugin/pom.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.thoughtworks.go</groupId>
+    <artifactId>gocd-fortify-plugin</artifactId>
+    <version>1.0.0</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <go.target.version>17.3.0</go.target.version>
+        <go.version>17.3.0</go.version>
+        <plugin.version>${project.version}</plugin.version>
+
+        <sonar.java.coveragePlugin>cobertura</sonar.java.coveragePlugin>
+        <sonar.cobertura.reportPath>target/site/cobertura/coverage.xml</sonar.cobertura.reportPath>
+        <sonar.language>java</sonar.language>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>cd.go.plugin</groupId>
+            <artifactId>go-plugin-api</artifactId>
+            <version>${go.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.thoughtworks.go</groupId>
+            <artifactId>gocd-plugin-common</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20140107</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.10.19</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>1.10.19</version>
+        </dependency>
+        <dependency>
+            <artifactId>guava</artifactId>
+            <groupId>com.google.guava</groupId>
+            <type>jar</type>
+            <version>14.0.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>resources</directory>
+            </resource>
+        </resources>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <finalName>${project.artifactId}-${project.version}</finalName>
+                    <outputDirectory>../out</outputDirectory>
+                    <archive>
+                        <manifestEntries>
+                            <Go-Version>${go.version}</Go-Version>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}\lib</outputDirectory>
+                            <includeScope>runtime</includeScope>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>false</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <!-- replaces the version number in plugin.xml -->
+                <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>replacer</artifactId>
+                <version>1.5.3</version>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <file>${project.basedir}/target/classes/plugin.xml</file>
+                    <replacements>
+                        <replacement>
+                            <token>GO_TARGET_VERSION_NUMBER</token>
+                            <value>${go.target.version}</value>
+                        </replacement>
+                        <replacement>
+                            <token>PLUGIN_VERSION_NUMBER</token>
+                            <value>${plugin.version}</value>
+                        </replacement>
+                    </replacements>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/fortify-plugin/resources/plugin.xml b/fortify-plugin/resources/plugin.xml
new file mode 100755
index 0000000..cc4558e
--- /dev/null
+++ b/fortify-plugin/resources/plugin.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<go-plugin id="fortify.plugin" version="1">
+<about>
+<name>Fortify plugin</name>
+<version>1.0</version>
+<target-go-version>16.4.0</target-go-version>
+<description>
+    Fortify plugin
+</description>
+<vendor>
+    <name>Camil Bradea</name>
+    <url></url>
+</vendor>
+</about>
+</go-plugin>
diff --git a/fortify-plugin/resources/test.properties b/fortify-plugin/resources/test.properties
new file mode 100755
index 0000000..e69de29
diff --git a/fortify-plugin/resources/views/task.template.html b/fortify-plugin/resources/views/task.template.html
new file mode 100755
index 0000000..6409796
--- /dev/null
+++ b/fortify-plugin/resources/views/task.template.html
@@ -0,0 +1,34 @@
+<div class="form_item_block">
+  <label>Username: <span class="asterisk">*</span>
+  </label>
+  <input type="text" ng-model="username" ng-required="true">
+  <span class="form_error" ng-show="GOINPUTNAME[username].$error.server">{{ GOINPUTNAME[username].$error.server }}</span>
+</div>
+
+<div class="form_item_block">
+  <label>Password: <span class="asterisk">*</span>
+  </label>
+  <input type="password" ng-model="password" ng-required="true">
+  <span class="form_error" ng-show="GOINPUTNAME[password].$error.server">{{ GOINPUTNAME[password].$error.server }}</span>
+</div>
+
+<div class="form_item_block">
+  <label>Fortify URL: <span class="asterisk">*</span>
+  </label>
+  <input type="text" ng-model="fortifyurl" ng-required="false">
+  <span class="form_error" ng-show="GOINPUTNAME[fortifyurl].$error.server">{{ GOINPUTNAME[fortifyurl].$error.server }}</span>
+</div>
+
+<div class="form_item_block">
+  <label>Project: <span class="asterisk">*</span>
+  </label>
+  <input type="text" ng-model="sscproject" ng-required="true">
+  <span class="form_error" ng-show="GOINPUTNAME[sscproject].$error.server">{{ GOINPUTNAME[sscproject].$error.server }}</span>
+</div>
+
+<div class="form_item_block">
+  <label>Version: <span class="asterisk">*</span>
+  </label>
+  <input type="text" ng-model="sscversion" ng-required="true">
+  <span class="form_error" ng-show="GOINPUTNAME[sscversion].$error.server">{{ GOINPUTNAME[sscversion].$error.server }}</span>
+</div>
\ No newline at end of file
diff --git a/fortify-plugin/src/com/tw/go/task/fortify/FortifyRequest.java b/fortify-plugin/src/com/tw/go/task/fortify/FortifyRequest.java
new file mode 100755
index 0000000..a036662
--- /dev/null
+++ b/fortify-plugin/src/com/tw/go/task/fortify/FortifyRequest.java
@@ -0,0 +1,80 @@
+package com.tw.go.task.fortify;
+
+import java.io.*;
+import java.security.GeneralSecurityException;
+
+import com.tw.go.plugin.common.ApiRequestBase;
+
+public class FortifyRequest extends ApiRequestBase
+{
+    private String sscProject = null;
+    private String sscVersion = null;
+    private String username = null;
+    private String password = null;
+
+    public FortifyRequest(String apiUrl, String accessKey, String secretKey, boolean disableSslVerification) throws GeneralSecurityException {
+        super(apiUrl, accessKey, secretKey, disableSslVerification);
+    }
+
+    public String request(String methodType ,String url, String accept)
+    {
+        String resultData = null;
+
+        setAccept(accept);
+        setBasicAuthentication(username, password);
+
+        try
+        {
+            if(methodType.equals("POST"))
+                resultData = requestPost(url, "");
+            if(methodType.equals("GET"))
+                resultData = requestGet(url);
+        }
+        catch (IOException e)
+        {
+            e.printStackTrace();
+        }
+
+        return resultData;
+    }
+
+    public void setUsername(String u)
+    {
+        username = u;
+    }
+
+    public void setPassword(String p)
+    {
+        password = p;
+    }
+
+    public void setSscProject(String ssp)
+    {
+        sscProject = ssp;
+    }
+
+    public void setSscVersion(String ssv)
+    {
+        sscVersion = ssv;
+    }
+
+    public String getUsername()
+    {
+        return username;
+    }
+
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public String getSscProject()
+    {
+        return sscProject;
+    }
+
+    public String getSscVersion()
+    {
+        return sscVersion;
+    }
+}
diff --git a/fortify-plugin/src/com/tw/go/task/fortify/FortifySortBasedOnUploadDate.java b/fortify-plugin/src/com/tw/go/task/fortify/FortifySortBasedOnUploadDate.java
new file mode 100755
index 0000000..269b7ba
--- /dev/null
+++ b/fortify-plugin/src/com/tw/go/task/fortify/FortifySortBasedOnUploadDate.java
@@ -0,0 +1,36 @@
+package com.tw.go.task.fortify;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import java.util.Comparator;
+
+public class FortifySortBasedOnUploadDate implements Comparator<JSONObject>
+{
+    @Override
+    public int compare(JSONObject lhs, JSONObject rhs)
+    {
+        try
+        {
+            if(lhs.getString("uploadDate").compareTo(rhs.getString("uploadDate")) == -1)
+            {
+                return -1;
+            }
+
+            if(lhs.getString("uploadDate").compareTo(rhs.getString("uploadDate")) == 0)
+            {
+                return 0;
+            }
+
+            if(lhs.getString("uploadDate").compareTo(rhs.getString("uploadDate")) == 1)
+            {
+                return 1;
+            }
+        }
+        catch (JSONException e)
+        {
+            e.printStackTrace();
+        }
+
+        return 0;
+    }
+}
diff --git a/fortify-plugin/src/com/tw/go/task/fortify/FortifyTask.java b/fortify-plugin/src/com/tw/go/task/fortify/FortifyTask.java
new file mode 100755
index 0000000..ee04f62
--- /dev/null
+++ b/fortify-plugin/src/com/tw/go/task/fortify/FortifyTask.java
@@ -0,0 +1,109 @@
+package com.tw.go.task.fortify;
+
+import com.google.gson.GsonBuilder;
+import com.thoughtworks.go.plugin.api.GoPluginIdentifier;
+import com.thoughtworks.go.plugin.api.annotation.Extension;
+import com.thoughtworks.go.plugin.api.request.GoPluginApiRequest;
+import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
+import com.tw.go.plugin.common.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+@Extension
+public class FortifyTask extends BaseGoPlugin
+{
+    public static final String USERNAME = "username";
+    public static final String PASSWORD = "password";
+    public static final String FORTIFY_URL = "fortifyurl";
+    public static final String SSC_PROJECT = "sscproject";
+    public static final String SSC_VERSION = "sscversion";
+
+    @Override
+    protected GoPluginApiResponse handleTaskView(GoPluginApiRequest request)
+    {
+        return getViewResponse("Fortify",
+                getClass().getResourceAsStream("/views/task.template.html"));
+    }
+
+    // https://developer.go.cd/current/writing_go_plugins/task/version_1_0/execute.html
+    @Override
+    protected GoPluginApiResponse handleTaskExecution(GoPluginApiRequest request)
+    {
+        Map executionRequest = (Map) new GsonBuilder().create().fromJson(request.requestBody(), Object.class);
+
+        Map<String, Map> config = (Map) executionRequest.get("config");
+
+        fixConfigAttrs(config,getConfigDef());
+
+        Context context = new Context((Map) executionRequest.get("context"));
+
+        Map<String, String> envVars = context.getEnvironmentVariables();
+
+        FortifyTaskExecutor executor = new FortifyTaskExecutor(
+                MaskingJobConsoleLogger.getConsoleLogger(), context, config);
+
+        // The RESPONSE_CODE MUST be 200 (SUCCESS) to be processed by Go.CD
+        // The outcome is defined by the property "success", and the cause can be stored in "message"
+        // See
+        //  public <T> T submitRequest(String pluginId, String requestName, PluginInteractionCallback<T> pluginInteractionCallback) {
+        // in
+        //  .../gocd/plugin-infra/go-plugin-access/src/com/thoughtworks/go/plugin/access/PluginRequestHelper.java
+
+        try
+        {
+            Result result = executor.execute();
+            return success(result.toMap());
+        }
+        catch (Exception e)
+        {
+            Result result = new Result(false,e.getMessage());
+            return success(result.toMap());
+        }
+
+    }
+
+    @Override
+    protected GoPluginApiResponse handleValidation(GoPluginApiRequest request)
+    {
+        HashMap result = new HashMap();
+        return success(result);
+    }
+
+    @Override
+    protected GoPluginApiResponse handleGetConfigRequest(GoPluginApiRequest request)
+    {
+        return success(getConfigDef());
+    }
+
+    private void fixConfigAttrs(Map<String, Map> configAct, Map<String, Map> configDef)
+    {
+        for (Map.Entry<String,Map> e : configAct.entrySet())
+        {
+            Map def = configDef.get(e.getKey());
+            Map act = e.getValue();
+
+            act.put("required",def.get("required"));
+            act.put("secure",def.get("secure"));
+        }
+    }
+
+    private Map getConfigDef()
+    {
+        return new ConfigDef()
+                .add(USERNAME, "", Required.NO)
+                .add(PASSWORD, "", Required.NO, Secure.YES)
+                .add(FORTIFY_URL, "", Required.YES)
+                .add(SSC_PROJECT, "", Required.YES)
+                .add(SSC_VERSION, "", Required.YES)
+                .toMap();
+    }
+
+    @Override
+    public GoPluginIdentifier pluginIdentifier()
+    {
+        return new GoPluginIdentifier("task", Arrays.asList("1.0"));
+    }
+}
+
diff --git a/fortify-plugin/src/com/tw/go/task/fortify/FortifyTaskExecutor.java b/fortify-plugin/src/com/tw/go/task/fortify/FortifyTaskExecutor.java
new file mode 100755
index 0000000..83facc7
--- /dev/null
+++ b/fortify-plugin/src/com/tw/go/task/fortify/FortifyTaskExecutor.java
@@ -0,0 +1,239 @@
+package com.tw.go.task.fortify;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.Context;
+import com.tw.go.plugin.common.GoApiConstants;
+import com.tw.go.plugin.common.Result;
+import com.tw.go.plugin.common.TaskExecutor;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import static com.tw.go.plugin.common.GoApiConstants.ENVVAR_NAME_GO_PIPELINE_COUNTER;
+
+public class FortifyTaskExecutor extends TaskExecutor
+{
+    public FortifyTaskExecutor(JobConsoleLogger console, Context context, Map config)
+    {
+        super(console, context, config);
+    }
+
+    public Result execute() throws Exception
+    {
+        try
+        {
+            return runCommand();
+        }
+        catch (Exception e)
+        {
+            return new Result(false, getPluginLogPrefix() + e.getMessage(), e);
+        }
+    }
+
+    public Result runCommand() throws Exception
+    {
+        boolean passed = true;
+        int Ycritical = 0, Yhigh = 0, Ymedium = 0, Ylow = 0;
+        int timeout = 0;
+        int timeoutTime = 60000;
+        int timeLimit = 900000;
+
+        FortifyRequest request = new FortifyRequest("", "", "", true);
+        request.setUsername(configVars.getValue(FortifyTask.USERNAME));
+        request.setPassword(configVars.getValue(FortifyTask.PASSWORD));
+        request.setSscProject(configVars.getValue(FortifyTask.SSC_PROJECT));
+        request.setSscVersion(configVars.getValue(FortifyTask.SSC_VERSION));
+
+        getToken(request);
+
+        int projectId = getProjectId(request);
+        log("Project ID: " + projectId + "\n");
+
+        JSONArray array = getDataArrayArtifacts(request, projectId);
+
+        while(isUnsuccessfulScan(array)) {
+            array = getDataArrayArtifacts(request, projectId);
+
+            timeout = timeout + timeoutTime;
+
+            log("Couldn't find latest scan. Waiting for 1 minute and trying again ...");
+
+            if (timeout > timeLimit) {
+                return new Result(false, "[Fortify] Error ! " +
+                        "Couldn't find a Fortify scan created in this pipeline run !" + "\n");
+            }
+
+            Thread.sleep(timeoutTime);
+        }
+        passed = true;
+
+        JSONArray pointArrayData = getPointsArrayIssuePriority(request, projectId);
+
+        if (pointArrayData.length() > 0) {
+
+            for (int i = 0; i < pointArrayData.length(); i++) {
+                JSONObject points = pointArrayData.getJSONObject(i);
+                String filterX = points.getString("filterX");
+
+                if (filterX.equals("Critical"))
+                    Ycritical = points.getInt("y");
+                if (filterX.equals("High"))
+                    Yhigh = points.getInt("y");
+                if (filterX.equals("Medium"))
+                    Ymedium = points.getInt("y");
+                if (filterX.equals("Low"))
+                    Ylow = points.getInt("y");
+            }
+        }
+
+        log("Critical priority issues: " + Ycritical);
+        log("High priority issues: " + Yhigh);
+        log("Medium priority issues: " + Ymedium);
+        log("Low priority issues: " + Ylow + "\n");
+
+        if (Ycritical > 0 || Yhigh > 0)
+        {
+            passed = false;
+        }
+
+        log("Link to the scan: " + "https://v-fortifyapp/ssc/html/ssc/index.jsp#!/version/"
+                + projectId + "/scan" + "\n");
+
+        if(passed)
+            return new Result(true, "Finished");
+        else
+            return new Result(false, "[Fortify] Error ! There may be: \n- critical or high priority " +
+                    "issues\n" + "- there are scans which require approval" + "\n");
+    }
+
+    public boolean isUnsuccessfulScan(JSONArray array)
+    {
+        boolean unsuccessfulScan = false;
+
+        JSONObject obj = array.getJSONObject(0);
+
+        String pipelineNumber = obj.getString("originalFileName").substring(
+                obj.getString("originalFileName").lastIndexOf('_') + 1,
+                obj.getString("originalFileName").lastIndexOf('.'));
+
+        if(!pipelineNumber.equals(configVars.getValue(ENVVAR_NAME_GO_PIPELINE_COUNTER)))
+        {
+            unsuccessfulScan = true;
+        }
+
+        if(obj.getString("status").equals("REQUIRE_AUTH"))
+        {
+            log("Scan: ");
+            log("ID: " + obj.getInt("id"));
+            log("Filename: " + obj.getString("fileName"));
+            log("Original filename: " + obj.getString("originalFileName") + "\n");
+
+            unsuccessfulScan = true;
+        }
+
+        if(unsuccessfulScan)
+            return true;
+
+        return false;
+    }
+
+    public static JSONArray getSortedList(JSONArray array) throws JSONException {
+
+        List<JSONObject> list = new ArrayList<JSONObject>();
+
+        for (int i = 0; i < array.length(); i++) {
+            list.add(array.getJSONObject(i));
+        }
+
+        Collections.sort(list, new FortifySortBasedOnUploadDate());
+        JSONArray resultArray = new JSONArray(list);
+
+        return resultArray;
+    }
+
+    private JSONArray getDataArrayArtifacts(FortifyRequest request, int projectId) {
+        String result = request.request("GET", configVars.getValue(FortifyTask.FORTIFY_URL) +
+                "/api/v1/projectVersions/" + projectId + "/artifacts", "application/json");
+
+        JSONObject objResult = new JSONObject(result);
+        JSONArray arrayData = objResult.getJSONArray("data");
+
+        return arrayData;
+    }
+
+    private JSONArray getDataArrayIssueGroups(FortifyRequest request, int projectId) {
+        String result = request.request("GET", configVars.getValue(FortifyTask.FORTIFY_URL) +
+                "/api/v1/projectVersions/" + projectId + "/issueGroups", "application/json");
+
+        JSONObject objResult = new JSONObject(result);
+        JSONArray arrayData = objResult.getJSONArray("data");
+
+        return arrayData;
+    }
+
+    private JSONArray getPointsArrayIssueFolder(FortifyRequest request, int projectId) {
+        JSONArray pointArrayData;
+        String result = request.request("GET", configVars.getValue(FortifyTask.FORTIFY_URL) +
+                "/api/v1/projectVersions/" + projectId +
+                "/issueSummaries/?seriestype=DEFAULT&groupaxistype=ISSUE_FOLDER",
+                "application/json");
+
+        JSONObject objResult = new JSONObject(result);
+        JSONArray arrayData = objResult.getJSONArray("data");
+        JSONObject first = arrayData.getJSONObject(0);
+        JSONArray seriesArrayData = first.getJSONArray("series");
+        JSONObject series = seriesArrayData.getJSONObject(0);
+        pointArrayData = series.getJSONArray("points");
+
+        return pointArrayData;
+    }
+
+    private JSONArray getPointsArrayIssuePriority(FortifyRequest request, int projectId) {
+        String result = request.request("GET", configVars.getValue(FortifyTask.FORTIFY_URL) +
+                "/api/v1/projectVersions/" + projectId +
+                "/issueSummaries/?seriestype=DEFAULT&groupaxistype=ISSUE_FRIORITY",
+                "application/json");
+
+        JSONObject objResult = new JSONObject(result);
+        JSONArray arrayData = objResult.getJSONArray("data");
+        JSONObject first = arrayData.getJSONObject(0);
+        JSONArray seriesArrayData = first.getJSONArray("series");
+
+        if (seriesArrayData.length() > 0 ){
+            JSONObject series = seriesArrayData.getJSONObject(0);
+            return series.getJSONArray("points");
+        }
+        else {
+            return seriesArrayData;
+        }
+    }
+
+    private int getProjectId(FortifyRequest request) {
+        String result = request.request("GET", "https://v-fortifyapp/ssc" +
+                "/api/v1/projectVersions?q=project.name:" + request.getSscProject() +
+                "%2BAND%2Bname:" + request.getSscVersion() + "&fields=id",
+                "application/json");
+
+        JSONObject objResult = new JSONObject(result);
+        JSONArray arrayData = objResult.getJSONArray("data");
+        JSONObject first = arrayData.getJSONObject(0);
+        int projectId = first.getInt("id");
+
+        return projectId;
+    }
+
+    private void getToken(FortifyRequest request) {
+        String result = request.request("POST", configVars.getValue(FortifyTask.FORTIFY_URL) +
+                "/api/v1/auth/obtain_token", "application/json");
+    }
+
+    @Override
+    protected String getPluginLogPrefix()
+    {
+        return "[Fortify] ";
+    }
+}
diff --git a/fortify-plugin/test/FortifyTest.java b/fortify-plugin/test/FortifyTest.java
new file mode 100644
index 0000000..8dbc9ef
--- /dev/null
+++ b/fortify-plugin/test/FortifyTest.java
@@ -0,0 +1,47 @@
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.Context;
+import java.util.Map;
+import com.tw.go.task.fortify.FortifyRequest;
+import com.tw.go.task.fortify.FortifyTaskExecutor;
+
+import org.json.JSONArray;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import static org.junit.Assert.assertEquals;
+
+import java.security.GeneralSecurityException;
+
+public class FortifyTest
+{
+    FortifyRequest request;
+
+    @Before
+    public void init() throws GeneralSecurityException
+    {
+        request = new FortifyRequest("", "", "", true);
+        request.setUsername("user");
+        request.setPassword("password");
+        request.setSscProject("project");
+        request.setSscVersion("version");
+    }
+
+    @Test
+    public void requestPropertiesTest() throws GeneralSecurityException
+    {
+        assertEquals("user", request.getUsername());
+        assertEquals("password", request.getPassword());
+        assertEquals("project", request.getSscProject());
+        assertEquals("version", request.getSscVersion());
+    }
+
+    @Test public void getRequestTest()
+    {
+        assertEquals(true, !"".equals(request.request("GET", "https://httpbin.org/get", "")));
+    }
+
+    @Test public void postRequestTest()
+    {
+        assertEquals(true, !"".equals(request.request("POST", "http://posttestserver.com/post.php", "")));
+    }
+}
\ No newline at end of file
diff --git a/nessus-scan-plugin/pom.xml b/nessus-scan-plugin/pom.xml
old mode 100644
new mode 100755
diff --git a/nessus-scan-plugin/src/com/tw/go/task/nessusscan/NessusClient.java b/nessus-scan-plugin/src/com/tw/go/task/nessusscan/NessusClient.java
old mode 100644
new mode 100755
diff --git a/nessus-scan-plugin/src/com/tw/go/task/nessusscan/NessusScanParser.java b/nessus-scan-plugin/src/com/tw/go/task/nessusscan/NessusScanParser.java
old mode 100644
new mode 100755
diff --git a/nessus-scan-plugin/src/com/tw/go/task/nessusscan/NessusScanTask.java b/nessus-scan-plugin/src/com/tw/go/task/nessusscan/NessusScanTask.java
old mode 100644
new mode 100755
index 2d2b744..382ec74
--- a/nessus-scan-plugin/src/com/tw/go/task/nessusscan/NessusScanTask.java
+++ b/nessus-scan-plugin/src/com/tw/go/task/nessusscan/NessusScanTask.java
@@ -11,10 +11,7 @@
 import com.thoughtworks.go.plugin.api.response.DefaultGoApiResponse;
 import com.thoughtworks.go.plugin.api.response.DefaultGoPluginApiResponse;
 import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
-import com.thoughtworks.go.plugin.api.task.*;
-import com.tw.go.plugin.common.Context;
-import com.tw.go.plugin.common.GoApiConstants;
-import com.tw.go.plugin.common.Result;
+import com.tw.go.plugin.common.*;
 import org.apache.commons.io.IOUtils;
 import com.google.gson.GsonBuilder;
 
@@ -22,6 +19,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.thoughtworks.go.plugin.api.response.DefaultGoPluginApiResponse.SUCCESS_RESPONSE_CODE;
+
 @Extension
 public class NessusScanTask implements GoPlugin {
 
@@ -41,16 +40,21 @@ public void initializeGoApplicationAccessor(GoApplicationAccessor goApplicationA
 
     @Override
     public GoPluginApiResponse handle(GoPluginApiRequest request) throws UnhandledRequestTypeException {
-        if ("configuration".equals(request.requestName())) {
-            return handleGetConfigRequest();
-        } else if ("validate".equals(request.requestName())) {
-            return handleValidation();
-        } else if ("execute".equals(request.requestName())) {
-            return handleTaskExecution(request);
-        } else if ("view".equals(request.requestName())) {
-            return handleTaskView();
+        switch (request.requestName()) {
+            case "configuration":
+            case "go.plugin-settings.get-configuration":
+                return handleGetConfigRequest();
+            case "validate":
+            case "go.plugin-settings.validate-configuration":
+                return handleValidation();
+            case "execute":
+                return handleTaskExecution(request);
+            case "view":
+            case "go.plugin-settings.get-view":
+                return handleTaskView();
+            default:
+                throw new UnhandledRequestTypeException(request.requestName());
         }
-        throw new UnhandledRequestTypeException(request.requestName());
     }
 
     private GoPluginApiResponse handleTaskView() {
@@ -73,10 +77,16 @@ private GoPluginApiResponse handleTaskExecution(GoPluginApiRequest request) {
         Map config = (Map) executionRequest.get("config");
         Map context = (Map) executionRequest.get("context");
 
-        NessusScanTaskExecutor executor = new NessusScanTaskExecutor(JobConsoleLogger.getConsoleLogger(), new Context(context), config );
+        NessusScanTaskExecutor executor = new NessusScanTaskExecutor(MaskingJobConsoleLogger.getConsoleLogger(), new Context(context), config );
+
+        try {
+            Result result = executor.execute();
+            return createResponse(result.responseCode(), result.toMap());
+        } catch (Exception e) {
+            Result result = new Result(false,e.getMessage());
+            return createResponse(SUCCESS_RESPONSE_CODE, result.toMap());
+        }
 
-        Result result = executor.execute();
-        return createResponse(result.responseCode(), result.toMap());
     }
 
     private GoPluginApiResponse handleValidation() {
diff --git a/nessus-scan-plugin/src/com/tw/go/task/nessusscan/NessusScanTaskExecutor.java b/nessus-scan-plugin/src/com/tw/go/task/nessusscan/NessusScanTaskExecutor.java
old mode 100644
new mode 100755
diff --git a/plugin-common/plugin-common.iml b/plugin-common/plugin-common.iml
old mode 100644
new mode 100755
diff --git a/plugin-common/pom.xml b/plugin-common/pom.xml
old mode 100644
new mode 100755
index d34c72d..ea44c3b
--- a/plugin-common/pom.xml
+++ b/plugin-common/pom.xml
@@ -9,9 +9,10 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <go.target.version>15.1.0</go.target.version>
-        <go.version>15.1.0</go.version>
+        <go.target.version>16.4.0</go.target.version>
+        <go.version>16.4.0</go.version>
         <plugin.version>${project.version}</plugin.version>
+        <maven.test.skip>true</maven.test.skip>
 
         <sonar.java.coveragePlugin>cobertura</sonar.java.coveragePlugin>
         <sonar.cobertura.reportPath>target/site/cobertura/coverage.xml</sonar.cobertura.reportPath>
@@ -57,9 +58,9 @@
             <version>1.10.19</version>
         </dependency>
         <dependency>
-            <groupId>com.mashape.unirest</groupId>
-            <artifactId>unirest-java</artifactId>
-            <version>1.4.9</version>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.0.1</version>
         </dependency>
 
     </dependencies>
diff --git a/plugin-common/resources/test.properties b/plugin-common/resources/test.properties
old mode 100644
new mode 100755
index 8d4dd31..86da82a
--- a/plugin-common/resources/test.properties
+++ b/plugin-common/resources/test.properties
@@ -1,11 +1,11 @@
-GO_SERVER_URL = http://localhost:8153/go/
-GO_PIPELINE_NAME = TestPluginsPipeline
-GO_PIPELINE_COUNTER = 1
-GO_STAGE_NAME = TestPluginStage
+GO_SERVER_URL = https://gocd-oss.haufe.cloud/go/
+GO_PIPELINE_NAME = UnitTestsPipeline
+GO_PIPELINE_COUNTER = 2
+GO_STAGE_NAME = defaultStage
 GO_STAGE_COUNTER = 1
-GO_JOB_NAME = TestPluginJob
+GO_JOB_NAME = defaultJob
 GO_TRIGGER_USER =
 GO_USER =
 GO_PASSWORD =
-GO_BUILD_USER_PASSWORD = test
-GO_BUILD_USER = TestUser
+GO_BUILD_USER_PASSWORD = testuser
+GO_BUILD_USER = Test!23
diff --git a/plugin-common/src/com/tw/go/plugin/common/AbstractCommand.java b/plugin-common/src/com/tw/go/plugin/common/AbstractCommand.java
new file mode 100755
index 0000000..a5d946c
--- /dev/null
+++ b/plugin-common/src/com/tw/go/plugin/common/AbstractCommand.java
@@ -0,0 +1,150 @@
+package com.tw.go.plugin.common;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public abstract class AbstractCommand implements ICommand {
+    protected List<String> command = new ArrayList<>();
+    protected Map<String, String> environment = new HashMap<>();
+    protected JobConsoleLogger console;
+    private ProcessRunner processRunner;
+    protected boolean ignoreErrors = false;
+    protected boolean showConsoleOutput = true;
+    private ProcessOutput processOutput = null;
+
+    protected static String workingDir = null;
+
+    public static String getAbsoluteWorkingDir() {
+        return workingDir;
+    }
+
+    public static void setWorkingDir(String workingDir) {
+        AbstractCommand.workingDir = Paths.get(workingDir).toAbsolutePath().normalize().toString();
+    }
+
+    public AbstractCommand(JobConsoleLogger console) {
+        this(console, new ProcessRunner(), false);
+    }
+
+    public AbstractCommand(JobConsoleLogger console, boolean ignoreErrors) {
+        this(console, new ProcessRunner(), ignoreErrors);
+    }
+
+    public AbstractCommand(JobConsoleLogger console, ProcessRunner processRunner, boolean ignoreErrors) {
+        this.processRunner = processRunner;
+        this.console = console;
+        this.ignoreErrors = ignoreErrors;
+    }
+
+    static public Map splitKeyValues(String s) {
+        Map m = new HashMap<>();
+        String k = "";
+        String t = "";
+        char c;
+        s += ';';
+        for (int i = 0; i < s.length(); ) {
+            c = s.charAt(i++);
+            switch (c) {
+                // unescaped , or ; is separator between key/value pairs
+                case ';':
+                case ',':
+                    if (!k.isEmpty()) {
+                        m.put(k, t);
+                        k = t = "";
+                    }
+                    break;
+                // first '=' is separator between key and value. subsequent '=' are treated as part of value
+                case '=':
+                    if (k.isEmpty()) {
+                        k = t.trim();
+                        t = "";
+                    } else {
+                        t += c;
+                    }
+                    break;
+                // Any character after a backslash ('\') is simply appended to t.
+                case '\\':
+                    c = s.charAt(i++);
+                default:
+                    t += c;
+                    break;
+            }
+        }
+        return m;
+    }
+
+    public AbstractCommand disableConsoleOutput() {
+        this.showConsoleOutput = false;
+        return this;
+    }
+
+    @Override
+    public void run() throws Exception {
+        if (showConsoleOutput) {
+            console.printLine("Run " + renderDisplay());
+        }
+
+        synchronized (AbstractCommand.class) {
+            processOutput = processRunner.execute(console, showConsoleOutput, workingDir, command, environment);
+        }
+
+        if (!isSuccessful()) {
+            if (!ignoreErrors) {
+                throw new RuntimeException("External process failed. See Job console output for more information.");
+            }
+        }
+    }
+
+    public ProcessOutput getProcessOutput() {
+        return processOutput;
+    }
+
+    public boolean isSuccessful() {
+        return processOutput != null && processOutput.isZeroReturnCode();
+    }
+
+    public AbstractCommand add(String setting) {
+        command.add(setting);
+        return this;
+    }
+
+    public AbstractCommand addEnv(String name, String value) {
+        environment.put(name, value);
+        return this;
+    }
+
+    public AbstractCommand addEnv(Map map) {
+        environment.putAll(map);
+        return this;
+    }
+
+    protected AbstractCommand addEnvFromConfig(ConfigVars configVars, String key) {
+        addEnv(key, configVars.getValue(key));
+        return this;
+    }
+
+    protected String renderDisplay() {
+        StringBuilder sb = new StringBuilder();
+
+        for (String s : command) {
+            if (sb.length() > 0) {
+                sb.append(' ');
+            }
+
+            if (sb.length() == 0 || s.charAt(0) == '-') {
+                sb.append(s);
+            } else {
+                sb.append('"');
+                sb.append(s);
+                sb.append('"');
+            }
+        }
+
+        return sb.toString();
+    }
+}
\ No newline at end of file
diff --git a/plugin-common/src/com/tw/go/plugin/common/ApiRequestBase.java b/plugin-common/src/com/tw/go/plugin/common/ApiRequestBase.java
old mode 100644
new mode 100755
index f659e5b..3ab854f
--- a/plugin-common/src/com/tw/go/plugin/common/ApiRequestBase.java
+++ b/plugin-common/src/com/tw/go/plugin/common/ApiRequestBase.java
@@ -1,12 +1,19 @@
 package com.tw.go.plugin.common;
 
+import okhttp3.*;
+
 import javax.net.ssl.*;
-import javax.xml.bind.DatatypeConverter;
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.security.GeneralSecurityException;
-import java.security.cert.X509Certificate;
+import java.security.cert.CertificateException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 
 /**
@@ -17,204 +24,215 @@ public abstract class ApiRequestBase {
     private String apiUrl;
     private String secretKey;
     private String accessKey;
-    private boolean apiKeysAvailable;
-    private String basicAuthEncoding;
-    private boolean basicAuthAvailable;
+    private OkHttpClient client;
+    private String username = null;
+    private String password = null;
+    private String accept = null;
+    private String defaultAccept = null;
+    private long http202RetryMillis = 3000;
+    private long http202RetryCount = 20;
+
+
+    public void setHttp202RetryMillis(long http202RetryMillis) {
+        this.http202RetryMillis = http202RetryMillis;
+    }
+
+    public ApiRequestBase(String apiUrl, String accessKey, String secretKey, boolean disableSslVerification) throws GeneralSecurityException {
+        this(apiUrl, accessKey, secretKey, disableSslVerification, false);
+    }
+
+    public ApiRequestBase(String apiUrl, String accessKey, String secretKey, boolean disableSslVerification, boolean cookiesEnabled) throws GeneralSecurityException {
+        client = getOkHttpClient(disableSslVerification, cookiesEnabled);
 
-    public ApiRequestBase(String apiUrl, String accessKey, String secretKey, boolean disableSslVerification) throws GeneralSecurityException
-    {
         this.apiUrl = apiUrl;
-        if(secretKey.isEmpty() && accessKey.isEmpty())
-        {
-            apiKeysAvailable = false;
-        }
-        else
-        {
-            apiKeysAvailable = true;
-            this.secretKey = secretKey;
-            this.accessKey = accessKey;
-        }
+        this.secretKey = secretKey;
+        this.accessKey = accessKey;
+    }
 
-        if(disableSslVerification){
-            disableSslVerification();
-        }
+    public void setBasicAuthentication(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
 
-        basicAuthAvailable = false;
+    public void setAccept(String accept) {
+        this.accept = accept;
     }
 
-    public void setBasicAuthentication(String username, String password)
-    {
-        String userPassword = username + ":" + password;
-        byte[] bytesToEncode = userPassword.getBytes();
-        basicAuthEncoding = DatatypeConverter.printBase64Binary(bytesToEncode);
-        basicAuthAvailable = true;
+    public void setDefaultAccept(String accept) {
+        this.defaultAccept = accept;
+        if (accept == null) {
+            setAccept(accept);
+        }
     }
 
-    public String getApiUrl(){
+    public String getApiUrl() {
         return apiUrl;
     }
 
-
-    protected String requestGet(String requestUrlString) throws IOException{
-        return request(requestUrlString, "GET" );
+    protected String requestGet(String requestUrlString) throws IOException {
+        return request(requestUrlString, "GET");
     }
 
-    protected void requestDelete(String requestUrl) throws IOException
-    {
+    protected void requestDelete(String requestUrl) throws IOException {
         request(requestUrl, "DELETE");
     }
 
-    protected String requestPost(String requestUrlString, String jsonData) throws IOException{
+    protected String requestPost(String requestUrlString, String jsonData) throws IOException {
         return request(requestUrlString, jsonData, "POST");
     }
 
-    protected String requestPostFormUrlEncoded(String requestUrlString, String data) throws IOException{
-        return request(requestUrlString, data, "POST", "application/x-www-form-urlencoded");
+    protected String requestPostFormUrlEncoded(String requestUrlString, String data) throws IOException {
+        return request(requestUrlString, "POST", data, "application/x-www-form-urlencoded");
     }
 
-    private String request(String requestUrlString, String requestMethod) throws IOException {
-        String result = "";
-
-        HttpURLConnection conn = createConnection(requestUrlString, requestMethod, "application/json");
-        conn.setRequestMethod(requestMethod);
-
-        if (conn.getResponseCode() != 200) {
-            if(conn.getResponseCode() == 404)
-            {
-                throw new FileNotFoundException("Failed : HTTP error code : "
-                    + conn.getResponseCode() + " Reguested Uri: " + requestUrlString);
-            }
-            throw new IOException("Failed : HTTP error code : "
-                    + conn.getResponseCode());
-        }
-
-        try {
-            BufferedReader in = new BufferedReader(new InputStreamReader(
-                    conn.getInputStream()));
-
-            StringBuilder response = new StringBuilder();
-            String inputLine;
-
-            while ((inputLine = in.readLine()) != null) {
-                response.append(inputLine);
-                response.append("\n");
-            }
-            in.close();
-
-            result = response.toString();
-        }
-        catch (FileNotFoundException e){
-            throw e;
-        }
-        catch (IOException e){
-            throw e;
-        }
-
-        finally {
-            conn.disconnect();
-        }
-
-        return result;
+    private String request(String requestUrlString, String jsonData, String requestMethod) throws IOException {
+        return request(requestUrlString, requestMethod, jsonData, "application/json");
     }
 
-    private String request(String requestUrlString, String jsonData, String requestMethod) throws  IOException {
-        return request(requestUrlString, jsonData, requestMethod, "application/json");
+    private String request(String requestUrlString, String requestMethod) throws IOException {
+        return request(requestUrlString, requestMethod, null, "application/json");
     }
 
-    private String request(String requestUrlString, String data, String requestMethod, String contentType) throws IOException{
+    public String request(String requestUrlString, String requestMethod, String data, String contentType) throws IOException {
+        return requestBody(requestUrlString, requestMethod, data, contentType).string();
+    }
 
-        String result = "";
+    public InputStream requestStream(String requestUrlString, String requestMethod, String data, String contentType) throws IOException {
+        return requestBody(requestUrlString, requestMethod, data, contentType).byteStream();
+    }
 
-        HttpURLConnection conn = createConnection(requestUrlString, requestMethod, contentType);
-        conn.setRequestProperty("Content-Length", "" + Integer.toString(data.getBytes().length));
-        conn.setDoOutput(true);
+    private ResponseBody requestBody(String requestUrlString, String requestMethod, String data, String contentType) throws IOException {
+        Request.Builder builder = new Request.Builder()
+                .url(requestUrlString);
 
-        OutputStreamWriter out = new OutputStreamWriter(conn.getOutputStream());
-        out.write(data);
-        out.close();
+        // use whatever is set
+        if (accept != null) {
+            builder.addHeader("Accept", accept);
+        }
 
-        BufferedReader in = new BufferedReader(new InputStreamReader(
-                conn.getInputStream()));
+        // next time, use again the default
+        accept = defaultAccept;
 
-        StringBuilder response = new StringBuilder();
-        String inputLine;
+        if (username != null && password != null) {
+            builder.header("Authorization", Credentials.basic(username, password));
+        }
 
-        while ((inputLine = in.readLine()) != null) {
-            response.append(inputLine);
+        if (accessKey != null && secretKey != null) {
+            builder.header("X-ApiKeys", getXApiKeys()); // API keys for secure access
         }
-        in.close();
 
-        result = response.toString();
+        if (data != null) {
+            builder.method(requestMethod, RequestBody.create(MediaType.parse(contentType), data));
+            builder.header("Confirm", "true");
+        }
 
-        in.close();
-        conn.disconnect();
+        Request request = builder.build();
 
+        for (long retriesLeft = http202RetryCount; ; ) {
+            Response response = client.newCall(request).execute();
 
-        return result;
-    }
+            if (response.code() < 200 || response.code() >= 300) {
+                throw new IOException("REST call failed; URL=" + response.request().url() + "; Code=" + response.code() + "; Message=" + response.message());
+            }
 
-    private HttpURLConnection createConnection(String requestUrlString, String requestMethod, String contentType) throws IOException{
-        URL url = new URL(requestUrlString);
-        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            if (response.code() != 202) {
+                return response.body();
+            }
 
-        conn.setRequestMethod(requestMethod);
-        conn.setRequestProperty("Content-Type", contentType);
+            if (--retriesLeft == 0) {
+                throw new IOException("REST call failed; URL=" + response.request().url() + "; Code=" + response.code() +
+                        String.format("; Message= %d retries with timeout %dms failed", http202RetryCount, http202RetryMillis));
+            }
 
-        if(apiKeysAvailable) {
-            conn.setRequestProperty("X-ApiKeys", getXApiKeys()); // API keys for secure access
-        }
-        if(basicAuthAvailable) {
-            conn.setRequestProperty("Authorization", "Basic " + basicAuthEncoding);
+            try {
+                TimeUnit.MILLISECONDS.sleep(http202RetryMillis);
+            } catch (InterruptedException e) {
+                // do nothing ...
+            }
         }
-
-        conn.setConnectTimeout(5000);
-        conn.setReadTimeout(20000);
-
-        return conn;
     }
 
-    private String getXApiKeys()
-    {
+    private String getXApiKeys() {
         String apiKeys = "accessKey=%1$s; secretKey=%2$s;";
         return String.format(apiKeys, accessKey, secretKey);
     }
 
-    // this needs to be done, if there is no proper ssl connection available for nessus api server
-    private static void disableSslVerification() throws GeneralSecurityException {
+    public static String encodeFormData(String name, String value) throws UnsupportedEncodingException {
+        HashMap<String, String> map = new HashMap<>();
+        map.put(name, value);
+        return encodeFormData(map);
+    }
 
-        // Create a trust manager that does not validate certificate chains
-        TrustManager[] trustAllCerts = new TrustManager[] {new X509TrustManager() {
-            @Override
-            public X509Certificate[] getAcceptedIssuers() {
-                return new X509Certificate[0];
-            }
-            @Override
-            public void checkClientTrusted(X509Certificate[] certs, String authType) {
-                // do nothing here to disable that
-            }
-            @Override
-            public void checkServerTrusted(X509Certificate[] certs, String authType) {
-                // do nothing here to disable that
-            }
+    public static String encodeFormData(Map<String, String> data) throws UnsupportedEncodingException {
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, String> e : data.entrySet()) {
+            sb.append(e.getKey()).append('=').append(URLEncoder.encode(e.getValue(), "UTF-8"));
+            return sb.toString();
         }
-        };
-
-        // Install the all-trusting trust manager
-        SSLContext sc = SSLContext.getInstance("SSL");
-        sc.init(null, trustAllCerts, new java.security.SecureRandom());
-        HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
-
-        // Create all-trusting host name verifier
-        HostnameVerifier allHostsValid = new HostnameVerifier() {
-            @Override
-            public boolean verify(String hostname, SSLSession session) {
-                return true;
+        return sb.toString();
+    }
+
+    private static OkHttpClient getOkHttpClient(boolean disableSslVerification, boolean cookiesEnabled) {
+        try {
+            OkHttpClient.Builder builder = new OkHttpClient.Builder();
+            if (disableSslVerification) {
+                // Create a trust manager that does not validate certificate chains
+                final TrustManager[] trustAllCerts = new TrustManager[]{
+                        new X509TrustManager() {
+                            @Override
+                            public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
+                            }
+
+                            @Override
+                            public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
+                            }
+
+                            @Override
+                            public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+                                return new java.security.cert.X509Certificate[]{};
+                            }
+                        }
+                };
+
+                // Install the all-trusting trust manager
+                final SSLContext sslContext = SSLContext.getInstance("SSL");
+                sslContext.init(null, trustAllCerts, new java.security.SecureRandom());
+                // Create an ssl socket factory with our all-trusting manager
+                final SSLSocketFactory delegate = sslContext.getSocketFactory();
+
+                builder.sslSocketFactory(delegate);
+                builder.hostnameVerifier(new HostnameVerifier() {
+                    @Override
+                    public boolean verify(String hostname, SSLSession session) {
+                        return true;
+                    }
+                });
             }
-        };
 
-        // Install the all-trusting host verifier
-        HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid);
+            if (cookiesEnabled) {
+                builder.cookieJar(new CookieJar() {
+                    private final HashMap<HttpUrl, List<Cookie>> cookieStore = new HashMap<>();
+
+                    @Override
+                    public void saveFromResponse(HttpUrl url, List<Cookie> cookies) {
+                        cookieStore.put(url, cookies);
+                    }
+
+                    @Override
+                    public List<Cookie> loadForRequest(HttpUrl url) {
+                        List<Cookie> cookies = cookieStore.get(url);
+                        return cookies != null ? cookies : new ArrayList<Cookie>();
+                    }
+                });
+            }
 
+            return builder
+                    .connectTimeout(5, TimeUnit.SECONDS)
+                    .readTimeout(20, TimeUnit.SECONDS)
+                    .build();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
-}
+}
\ No newline at end of file
diff --git a/plugin-common/src/com/tw/go/plugin/common/BaseGoPlugin.java b/plugin-common/src/com/tw/go/plugin/common/BaseGoPlugin.java
old mode 100644
new mode 100755
index 86ba956..a7c97e8
--- a/plugin-common/src/com/tw/go/plugin/common/BaseGoPlugin.java
+++ b/plugin-common/src/com/tw/go/plugin/common/BaseGoPlugin.java
@@ -1,36 +1,59 @@
 package com.tw.go.plugin.common;
 
+import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.thoughtworks.go.plugin.api.AbstractGoPlugin;
-import com.thoughtworks.go.plugin.api.response.DefaultGoApiResponse;
-import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
 import com.thoughtworks.go.plugin.api.exceptions.UnhandledRequestTypeException;
+import com.thoughtworks.go.plugin.api.logging.Logger;
 import com.thoughtworks.go.plugin.api.request.GoPluginApiRequest;
+import com.thoughtworks.go.plugin.api.response.DefaultGoApiResponse;
+import com.thoughtworks.go.plugin.api.response.DefaultGoPluginApiResponse;
+import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
+import org.apache.commons.io.IOUtils;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.GeneralSecurityException;
+import java.util.HashMap;
 import java.util.Map;
 
-public abstract class BaseGoPlugin extends AbstractGoPlugin
-{
-    protected GoPluginApiResponse success(Object response)
-    {
+/**
+ * Created by thomassc on 21.04.16.
+ */
+public abstract class BaseGoPlugin extends AbstractGoPlugin {
+
+    protected Gson gson = new GsonBuilder().serializeNulls().create();
+    private static final Logger logger = Logger.getLoggerFor(BaseGoPlugin.class);
+
+    protected GoPluginApiResponse success(Object response) {
         return renderJSON(DefaultGoApiResponse.SUCCESS_RESPONSE_CODE, null, response);
     }
 
-    protected GoPluginApiResponse internalError(Object response)
-    {
+    protected GoPluginApiResponse internalError(Object response) {
         return renderJSON(DefaultGoApiResponse.INTERNAL_ERROR, null, response);
     }
 
-    protected GoPluginApiResponse validationError(Object response)
-    {
+    protected GoPluginApiResponse validationError(Object response) {
         return renderJSON(DefaultGoApiResponse.VALIDATION_ERROR, null, response);
     }
 
-    protected GoPluginApiResponse renderJSON(final int responseCode, Object response)
-    {
+    protected GoPluginApiResponse renderJSON(final int responseCode, Object response) {
         return renderJSON(responseCode, null, response);
     }
 
+    protected GoPluginApiResponse getViewResponse(String displayValue, InputStream template) {
+        HashMap result = new HashMap();
+        result.put("displayValue", displayValue);
+        try {
+            result.put("template", IOUtils.toString(template, "UTF-8"));
+            return success(result);
+        } catch (Exception e) {
+            String errorMessage = "Failed to find template: " + e.getMessage();
+            result.put("exception", errorMessage);
+            return internalError(result);
+        }
+    }
+
     // https://developer.go.cd/current/writing_go_plugins/task/version_1_0/configuration.html
     abstract protected GoPluginApiResponse handleGetConfigRequest(GoPluginApiRequest request);
 
@@ -38,61 +61,51 @@ protected GoPluginApiResponse renderJSON(final int responseCode, Object response
     abstract protected GoPluginApiResponse handleValidation(GoPluginApiRequest request);
 
     // https://developer.go.cd/current/writing_go_plugins/task/version_1_0/execute.html
-    abstract protected GoPluginApiResponse handleTaskExecution(GoPluginApiRequest request);
+    abstract protected GoPluginApiResponse handleTaskExecution(GoPluginApiRequest request) throws Exception;
 
     // https://developer.go.cd/current/writing_go_plugins/task/version_1_0/view.html
     abstract protected GoPluginApiResponse handleTaskView(GoPluginApiRequest request);
 
     // https://developer.go.cd/current/writing_go_plugins/json_message_based_plugin_api.html
     @Override
-    public GoPluginApiResponse handle(GoPluginApiRequest request) throws UnhandledRequestTypeException
-    {
-        switch (request.requestName())
-        {
-            case "configuration":
-
-            case "go.plugin-settings.get-configuration":
-                return handleGetConfigRequest(request);
-
-            case "validate":
-
-            case "go.plugin-settings.validate-configuration":
-                return handleValidation(request);
-
-            case "execute":
-                return handleTaskExecution(request);
-
-            case "view":
-
-            case "go.plugin-settings.get-view":
-                return handleTaskView(request);
-
-            default:
-                throw new UnhandledRequestTypeException(request.requestName());
+    public GoPluginApiResponse handle(GoPluginApiRequest request) throws UnhandledRequestTypeException {
+        try {
+            switch (request.requestName()) {
+                case "configuration":
+                case "go.plugin-settings.get-configuration":
+                    return handleGetConfigRequest(request);
+                case "validate":
+                case "go.plugin-settings.validate-configuration":
+                    return handleValidation(request);
+                case "execute":
+                    return handleTaskExecution(request);
+                case "view":
+                case "go.plugin-settings.get-view":
+                    return handleTaskView(request);
+                default:
+                    return DefaultGoPluginApiResponse.badRequest(String.format("Invalid request name %s", request.requestName()));
+            }
+        } catch (Throwable e) {
+            return DefaultGoPluginApiResponse.error(e.getMessage());
         }
     }
 
-    protected GoPluginApiResponse renderJSON(final int responseCode, final Map<String, String> responseHeaders, Object response)
-    {
-        final String json = response == null ? null : new GsonBuilder().serializeNulls().create().toJson(response);
-
-        return new GoPluginApiResponse()
-        {
+    protected GoPluginApiResponse renderJSON(final int responseCode, final Map<String, String> responseHeaders, Object response) {
+        final String json = response == null ? null : gson.toJson(response);
+        logger.debug(json);
+        return new GoPluginApiResponse() {
             @Override
-            public int responseCode()
-            {
+            public int responseCode() {
                 return responseCode;
             }
 
             @Override
-            public Map<String, String> responseHeaders()
-            {
+            public Map<String, String> responseHeaders() {
                 return responseHeaders;
             }
 
             @Override
-            public String responseBody()
-            {
+            public String responseBody() {
                 return json;
             }
         };
diff --git a/plugin-common/src/com/tw/go/plugin/common/ConfigDef.java b/plugin-common/src/com/tw/go/plugin/common/ConfigDef.java
old mode 100644
new mode 100755
index 1caef4f..0947ce1
--- a/plugin-common/src/com/tw/go/plugin/common/ConfigDef.java
+++ b/plugin-common/src/com/tw/go/plugin/common/ConfigDef.java
@@ -27,21 +27,21 @@ public ConfigDef withMap(Map map)
 
     public ConfigDef add(String id, String defaultValue)
     {
-        return add(id, defaultValue, Required.Yes, Secure.No);
+        return add(id, defaultValue, Required.YES, Secure.NO);
     }
 
-    public ConfigDef add(String id, String defaultValue, boolean required)
+    public ConfigDef add(String id, String defaultValue, Required required)
     {
-        return add(id, defaultValue, required, Secure.No);
+        return add(id, defaultValue, required, Secure.NO);
     }
 
-    public ConfigDef add(String id, String defaultValue, boolean required, boolean secure)
+    public ConfigDef add(String id, String defaultValue, Required required, Secure secure)
     {
         HashMap<String, Object> entry = new HashMap<>();
 
         entry.put("default-value", defaultValue);
-        entry.put("secure", secure);
-        entry.put("required", required);
+        entry.put("secure", Secure.YES == secure);
+        entry.put("required", Required.YES == required);
         map.put(id, entry);
 
         return this;
@@ -51,16 +51,6 @@ public Map toMap()
     {
         return map;
     }
+}
 
-    public static class Required
-    {
-        public static boolean Yes = true;
-        public static boolean No = false;
-    }
 
-    public static class Secure
-    {
-        public static boolean Yes = true;
-        public static boolean No = false;
-    }
-}
\ No newline at end of file
diff --git a/plugin-common/src/com/tw/go/plugin/common/ConfigVars.java b/plugin-common/src/com/tw/go/plugin/common/ConfigVars.java
new file mode 100755
index 0000000..168230a
--- /dev/null
+++ b/plugin-common/src/com/tw/go/plugin/common/ConfigVars.java
@@ -0,0 +1,65 @@
+package com.tw.go.plugin.common;
+
+import java.util.Map;
+import java.util.Set;
+
+public class ConfigVars {
+    protected Map<String, Map> config;
+    protected Map<String, String> envVars;
+
+    public ConfigVars(Map<String, Map> config, Map<String, String> envVars) {
+        this.config = config;
+        this.envVars = envVars;
+    }
+
+    public String getValue(String key) {
+        return getValue(key, "");
+    }
+
+    public String getValue(String key, String defaultValue) {
+        String value;
+        Map m = config.get(key);
+        if (m != null) {
+            value = m.get("value").toString();
+        } else {
+            value = envVars.get(key);
+        }
+        return value != null ? value : defaultValue;
+    }
+
+    public boolean isEmpty(String key) {
+        return getValue(key).isEmpty();
+    }
+
+    public boolean isChecked(String key) {
+        switch (getValue(key).toLowerCase()) {
+            case "true":
+            case "on":
+            case "yes":
+            case "active":
+            case "enabled":
+            case "1":
+            case "y":
+                return true;
+        }
+        return false;
+    }
+
+    public void setConfigValue(String key, String value) {
+        Map prop = config.get(key);
+        prop.put("value", value);
+        // config.put(key,prop);
+    }
+
+    public Set<String> configKeys() {
+        return config.keySet();
+    }
+
+    public Set<String> environmentKeys() {
+        return envVars.keySet();
+    }
+
+    public Map environmentVars() {
+        return envVars;
+    }
+}
\ No newline at end of file
diff --git a/plugin-common/src/com/tw/go/plugin/common/Context.java b/plugin-common/src/com/tw/go/plugin/common/Context.java
old mode 100644
new mode 100755
index 3136c2e..7dd0eaf
--- a/plugin-common/src/com/tw/go/plugin/common/Context.java
+++ b/plugin-common/src/com/tw/go/plugin/common/Context.java
@@ -1,5 +1,3 @@
-
-
 package com.tw.go.plugin.common;
 
 import java.util.Map;
@@ -13,7 +11,7 @@ public Context(Map context) {
         workingDir = (String) context.get("workingDirectory");
     }
 
-    public Map getEnvironmentVariables() {
+    public Map<String,String> getEnvironmentVariables() {
         return environmentVariables;
     }
 
diff --git a/plugin-common/src/com/tw/go/plugin/common/EnvVarParamParser.java b/plugin-common/src/com/tw/go/plugin/common/EnvVarParamParser.java
old mode 100644
new mode 100755
diff --git a/plugin-common/src/com/tw/go/plugin/common/ExecRequestData.java b/plugin-common/src/com/tw/go/plugin/common/ExecRequestData.java
new file mode 100755
index 0000000..aa3db15
--- /dev/null
+++ b/plugin-common/src/com/tw/go/plugin/common/ExecRequestData.java
@@ -0,0 +1,25 @@
+package com.tw.go.plugin.common;
+
+import java.util.Map;
+
+public class ExecRequestData extends RequestData {
+    public ExecRequestData(String payload) {
+        super(payload);
+    }
+
+    public Map config() {
+        return executionRequest.get("config");
+    }
+
+    public Map context() {
+        return executionRequest.get("context");
+    }
+
+    public Map<String, String> envVars() {
+        return (Map<String, String>) context().get("environmentVariables");
+    }
+
+    public String workDir() {
+        return (String) context().get("workingDirectory");
+    }
+}
\ No newline at end of file
diff --git a/plugin-common/src/com/tw/go/plugin/common/GoApiClient.java b/plugin-common/src/com/tw/go/plugin/common/GoApiClient.java
old mode 100644
new mode 100755
index 1a837b5..3f7b348
--- a/plugin-common/src/com/tw/go/plugin/common/GoApiClient.java
+++ b/plugin-common/src/com/tw/go/plugin/common/GoApiClient.java
@@ -1,58 +1,129 @@
 package com.tw.go.plugin.common;
 
-import org.json.JSONArray;
-import org.json.CDL;
-import org.json.JSONObject;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 
 import java.io.IOException;
-import java.net.URLEncoder;
+import java.io.InputStream;
 import java.security.GeneralSecurityException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Created by MarkusW on 17.11.2015.
  */
 public class GoApiClient extends ApiRequestBase {
 
+    public final static  String PLAIN_JSON = "application/json";
+    public final static  String API_V1_JSON = "application/vnd.go.cd.v1+json";
 
-    public GoApiClient(String apiUrl) throws GeneralSecurityException{
-        super(apiUrl, "", "", true);
+    Gson gson = new GsonBuilder().create();
+
+    public GoApiClient(String apiUrl) throws GeneralSecurityException {
+        super(apiUrl, null, null, true, true);
+        setDefaultAccept(API_V1_JSON);
     }
 
     public String getJobProperty(String pipelineName, String pipelineCounter, String stageName, String stageCounter, String jobName, String propertyName) throws IOException {
         String uri = getJobPropertyRequestUri(pipelineName, pipelineCounter, stageName, stageCounter, jobName, propertyName);
         String resultCSV = requestGet(uri);
-
-        // result is delivered in CSV. Only for this api function. We want to use JSON, so convert the stuff
-        JSONArray array = CDL.toJSONArray(resultCSV);
-        JSONObject obj = array.getJSONObject(0);
-
-        // get the request property value
-        return obj.getString(propertyName);
+        Map<String, String> map = fromCSV(resultCSV);
+        return map.get(propertyName);
     }
 
     public String setJobProperty(String pipelineName, String pipelineCounter, String stageName, String stageCounter, String jobName, String propertyName, String propertyValue) throws IOException {
         String uri = getJobPropertyRequestUri(pipelineName, pipelineCounter, stageName, stageCounter, jobName, propertyName);
-        String urlParameters = "value=" + URLEncoder.encode(propertyValue, "UTF-8");
-
-        requestPostFormUrlEncoded(uri, urlParameters);
-        return getJobProperty(pipelineName, pipelineCounter, stageName, stageCounter, jobName, propertyName);
+        String result = requestPostFormUrlEncoded(uri, encodeFormData("value", escapeCSV(propertyValue)));
+        return result.contains("created with value") ? propertyValue : result;
     }
 
-    public JSONObject getJobProperties(String pipelineName, String pipelineCounter, String stageName, String stageCounter, String jobName) throws IOException {
+    public Map<String, String> getJobProperties(String pipelineName, String pipelineCounter, String stageName, String stageCounter, String jobName) throws IOException {
         String uri = getJobPropertyRequestUri(pipelineName, pipelineCounter, stageName, stageCounter, jobName);
         String resultCSV = requestGet(uri);
+        Map<String, String> map = fromCSV(resultCSV);
+        return map;
+    }
+
+    public Map getPipelineConfig(String pipelineName, String pipelineCounter) throws IOException {
+        String uri = getPipelineConfigRequestUri(pipelineName, pipelineCounter);
+        String data = requestGet(uri);
+        return (Map) gson.fromJson(data, Object.class);
+    }
+
+    public InputStream getArtifact(String pipelineName, String pipelineCounter, String stageName, String stageCounter, String jobName, String artifact) throws IOException {
+        String uri = getArtifactRequestUri(pipelineName, pipelineCounter, stageName, stageCounter, jobName, artifact);
+        setAccept(PLAIN_JSON);
+        return requestStream(uri, "GET", null, null);
+    }
+
+    public Map getPipelineHistory(String pipelineName, int offset) throws IOException {
+        String uri = getPipelineHistoryRequestUri(pipelineName, offset);
+        setAccept(PLAIN_JSON);
+        String data = requestGet(uri);
+        return (Map) gson.fromJson(data, Object.class);
+    }
+
+    private String getPipelineHistoryRequestUri(String pipelineName, int offset) {
+        return getApiUrl() + "/api/pipelines/" + pipelineName + "/history/" + offset;
+    }
+
+    private String getPipelineConfigRequestUri(String pipelineName, String pipelineCounter) {
+        return getApiUrl() + "/api/pipelines/" + pipelineName + "/instance/" + pipelineCounter;
+    }
 
-        // result is delivered in CSV. Only for this api function. We want to use JSON, so convert the stuff
-        JSONArray array = CDL.toJSONArray(resultCSV);
-        return array.getJSONObject(0);
+    private String getJobPropertyRequestUri(String pipelineName, String pipelineCounter, String stageName, String stageCounter, String jobName, String propertyName) {
+        return getApiUrl() + "/properties/" + pipelineName + "/" + pipelineCounter + "/" + stageName + "/" + stageCounter + "/" + jobName + "/" + propertyName;
     }
 
-    private String getJobPropertyRequestUri(String pipelineName, String pipelineCounter, String stageName, String stageCounter, String jobName, String propertyName){
-        return getApiUrl() + "properties/" + pipelineName + "/" + pipelineCounter + "/" + stageName + "/" + stageCounter + "/" + jobName + "/" + propertyName;
+    private String getJobPropertyRequestUri(String pipelineName, String pipelineCounter, String stageName, String stageCounter, String jobName) {
+        return getApiUrl() + "/properties/" + pipelineName + "/" + pipelineCounter + "/" + stageName + "/" + stageCounter + "/" + jobName;
+    }
+
+    private String getArtifactRequestUri(String pipelineName, String pipelineCounter, String stageName, String stageCounter, String jobName, String artifact) {
+        return getApiUrl() + "/files/" + pipelineName + "/" + pipelineCounter + "/" + stageName + "/" + stageCounter + "/" + jobName + "/" + artifact;
+    }
+
+
+    private static String escapeCSV(String csv) {
+        return csv.replace("\\", "\\\\")
+                .replace(",", "\\,")
+                .replace("\n", "\\\n,");
     }
 
-    private String getJobPropertyRequestUri(String pipelineName, String pipelineCounter, String stageName, String stageCounter, String jobName){
-        return getApiUrl() + "properties/" + pipelineName + "/" + pipelineCounter + "/" + stageName + "/" + stageCounter + "/" + jobName;
+    private static Map<String, String> fromCSV(String csv) {
+        HashMap data = new HashMap();
+        StringBuilder sb = new StringBuilder();
+        ArrayList<String> header = new ArrayList<>();
+        boolean readHeaders = true;
+        int col = 0;
+        for (char c : csv.toCharArray()) {
+            if (c == ',') {
+                if (readHeaders) {
+                    header.add(sb.toString());
+                } else {
+                    data.put(header.get(col), sb.toString());
+                }
+                sb.setLength(0);
+                col++;
+            }
+            else if (c == '\n') {
+                if (!readHeaders) {
+                    data.put(header.get(col), sb.toString());
+                    sb.setLength(0);
+                    col = 0;
+                    break;
+                }
+                header.add(sb.toString());
+                sb.setLength(0);
+                col = 0;
+                readHeaders = false;
+            }
+            else {
+                sb.append(c);
+            }
+        }
+        return data;
     }
 
-}
+}
\ No newline at end of file
diff --git a/plugin-common/src/com/tw/go/plugin/common/GoApiConstants.java b/plugin-common/src/com/tw/go/plugin/common/GoApiConstants.java
old mode 100644
new mode 100755
index 7eb88d6..3b6cf32
--- a/plugin-common/src/com/tw/go/plugin/common/GoApiConstants.java
+++ b/plugin-common/src/com/tw/go/plugin/common/GoApiConstants.java
@@ -7,8 +7,16 @@ public class GoApiConstants {
 
     // environment variable names
     public static final String ENVVAR_NAME_GO_SERVER_URL = "GO_SERVER_URL";
+    public static final String ENVVAR_NAME_GO_PIPELINE_NAME = "GO_PIPELINE_NAME";
+    public static final String ENVVAR_NAME_GO_PIPELINE_COUNTER = "GO_PIPELINE_COUNTER";
+    public static final String ENVVAR_NAME_GO_STAGE_NAME = "GO_STAGE_NAME";
+    public static final String ENVVAR_NAME_GO_STAGE_COUNTER = "GO_STAGE_COUNTER";
+    public static final String ENVVAR_NAME_GO_JOB_NAME = "GO_JOB_NAME";
+    public static final String ENVVAR_NAME_COUNTER_LATEST = "LATEST";
     public static final String ENVVAR_NAME_GO_BUILD_USER = "GO_BUILD_USER";
     public static final String ENVVAR_NAME_GO_BUILD_USER_PASSWORD = "GO_BUILD_USER_PASSWORD";
+    public static final String ENVVAR_NAME_GO_WORKING_DIR = "GO_WORKING_DIR";
+    public static final String ENVVAR_GO_REVISION = "GO_REVISION";
 
     // property names
     public static final String PROPERTY_NAME_VALUE = "value";
diff --git a/plugin-common/src/com/tw/go/plugin/common/ICommand.java b/plugin-common/src/com/tw/go/plugin/common/ICommand.java
new file mode 100755
index 0000000..8127efb
--- /dev/null
+++ b/plugin-common/src/com/tw/go/plugin/common/ICommand.java
@@ -0,0 +1,6 @@
+package com.tw.go.plugin.common;
+
+public interface ICommand
+{
+    void run() throws Exception;
+}
\ No newline at end of file
diff --git a/plugin-common/src/com/tw/go/plugin/common/InputStreamDecorator.java b/plugin-common/src/com/tw/go/plugin/common/InputStreamDecorator.java
deleted file mode 100644
index a2de466..0000000
--- a/plugin-common/src/com/tw/go/plugin/common/InputStreamDecorator.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.tw.go.plugin.common;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.LinkedList;
-
-public class InputStreamDecorator extends InputStream
-{
-    private BufferedReader br;
-    private LinkedList<Integer> outQueue = new LinkedList<>();
-    private final byte[] prefix;
-    private final byte[] eol = "\n".getBytes();
-
-    public InputStreamDecorator(InputStream in, String prefix)
-    {
-        this.br = new BufferedReader(new InputStreamReader(in));
-        this.prefix = prefix.getBytes();
-    }
-
-    @Override
-    public int read() throws IOException
-    {
-        if (outQueue.isEmpty())
-        {
-            String line = br.readLine();
-
-            if (line == null)
-            {
-            return -1;
-            }
-
-            for (byte b : prefix)
-            {
-            outQueue.add((int) b);
-            }
-
-            byte[] bytes = line.getBytes();
-
-            for (byte b : bytes)
-            {
-                outQueue.add((int) b);
-            }
-
-            outQueue.add((int)eol[0]);
-        }
-
-        return outQueue.remove();
-    }
-
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException
-    {
-        int i = 0;
-
-        for (; ; )
-        {
-            int c = read();
-
-            if (c == -1)
-            {
-                break;
-            }
-
-            b[off + i++] = (byte)c;
-        }
-
-        return i > 0 ? i : -1;
-    }
-
-    @Override
-    public int available() throws IOException
-    {
-        int available = super.available();
-        return available > 0 ? available + prefix.length : 0;
-    }
-}
diff --git a/plugin-common/src/com/tw/go/plugin/common/JobPropParamParser.java b/plugin-common/src/com/tw/go/plugin/common/JobPropParamParser.java
old mode 100644
new mode 100755
index b572966..50c2f05
--- a/plugin-common/src/com/tw/go/plugin/common/JobPropParamParser.java
+++ b/plugin-common/src/com/tw/go/plugin/common/JobPropParamParser.java
@@ -32,9 +32,10 @@ protected String getParamVarValue(String propertiesVarParam) {
             // get go build user authorization
             if (envVars.get(GoApiConstants.ENVVAR_NAME_GO_BUILD_USER) != null &&
                     envVars.get(GoApiConstants.ENVVAR_NAME_GO_BUILD_USER_PASSWORD) != null) {
-                log("Authorization set");
-                log("User: " + envVars.get(GoApiConstants.ENVVAR_NAME_GO_BUILD_USER).toString());
-                log("Password: " + envVars.get(GoApiConstants.ENVVAR_NAME_GO_BUILD_USER_PASSWORD).toString());
+                // remove Authorization information
+                // log("Authorization set");
+                // log("User: " + envVars.get(GoApiConstants.ENVVAR_NAME_GO_BUILD_USER).toString());
+                // log("Password: " + envVars.get(GoApiConstants.ENVVAR_NAME_GO_BUILD_USER_PASSWORD).toString());
 
                 client.setBasicAuthentication(envVars.get(GoApiConstants.ENVVAR_NAME_GO_BUILD_USER).toString(), envVars.get(GoApiConstants.ENVVAR_NAME_GO_BUILD_USER_PASSWORD).toString());
             }
diff --git a/plugin-common/src/com/tw/go/plugin/common/LinesInputStream.java b/plugin-common/src/com/tw/go/plugin/common/LinesInputStream.java
new file mode 100755
index 0000000..b1a49e0
--- /dev/null
+++ b/plugin-common/src/com/tw/go/plugin/common/LinesInputStream.java
@@ -0,0 +1,57 @@
+package com.tw.go.plugin.common;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by thomassc on 07.06.16.
+ */
+public class LinesInputStream extends InputStream {
+    BufferedReader br;
+    ArrayList<String> lines = new ArrayList<>();
+    String line = "";
+    int lineIdx = 0;
+    boolean cacheOnly = false;
+
+    public LinesInputStream(InputStream is) {
+        br = new BufferedReader(new InputStreamReader(is));
+    }
+
+    @Override
+    public int read() throws IOException {
+        if (line == null) {
+            return -1;
+        }
+
+        if (lineIdx >= line.length()) {
+            fill();
+
+            if (line == null) {
+                return -1;
+            }
+        }
+
+        return line.charAt(lineIdx++);
+    }
+
+    void fill() {
+        try {
+            line = br.readLine();
+        } catch (IOException e) {
+//            e.printStackTrace();
+        }
+        if (line != null) {
+            lines.add(line);
+            line += '\n';
+            lineIdx = 0;
+        }
+    }
+
+    public List getLines() {
+        return lines;
+    }
+}
diff --git a/plugin-common/src/com/tw/go/plugin/common/ListUtil.java b/plugin-common/src/com/tw/go/plugin/common/ListUtil.java
new file mode 100755
index 0000000..5b26f14
--- /dev/null
+++ b/plugin-common/src/com/tw/go/plugin/common/ListUtil.java
@@ -0,0 +1,37 @@
+package com.tw.go.plugin.common;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.regex.Pattern;
+
+public class ListUtil {
+    public static String join(Collection c) {
+        return join(c, ", ");
+    }
+
+    public static String join(Collection c, String join) {
+        StringBuffer sb = new StringBuffer();
+        for (Iterator<Object> iterator = c.iterator(); iterator.hasNext(); ) {
+            sb.append(iterator.next());
+            if (iterator.hasNext()) {
+                sb.append(join);
+            }
+        }
+        return sb.toString();
+    }
+
+    public static String[] splitByFirstOrDefault(String args, Character separator) {
+        if (!args.isEmpty()) {
+            Character first = args.charAt(0);
+
+            if (!(Character.isLetterOrDigit(first))) {
+                separator = first;
+                args = args.substring(1);
+            }
+
+            return args.split(Pattern.quote(separator.toString()));
+        }
+
+        return new String[]{};
+    }
+}
\ No newline at end of file
diff --git a/plugin-common/src/com/tw/go/plugin/common/MaskingInputStream.java b/plugin-common/src/com/tw/go/plugin/common/MaskingInputStream.java
new file mode 100755
index 0000000..e13ff96
--- /dev/null
+++ b/plugin-common/src/com/tw/go/plugin/common/MaskingInputStream.java
@@ -0,0 +1,53 @@
+package com.tw.go.plugin.common;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by thomassc on 07.06.16.
+ */
+public class MaskingInputStream extends InputStream {
+    BufferedReader br;
+    MaskingJobConsoleLogger masker;
+    String line = "";
+    int lineIdx = 0;
+
+    public MaskingInputStream(InputStream is, MaskingJobConsoleLogger masker) {
+        br = new BufferedReader(new InputStreamReader(is));
+        this.masker = masker;
+    }
+
+    @Override
+    public int read() throws IOException {
+        if (line == null) {
+            return -1;
+        }
+
+        if (lineIdx >= line.length()) {
+            fill();
+
+            if (line == null) {
+                return -1;
+            }
+        }
+
+        return line.charAt(lineIdx++);
+    }
+
+    void fill() {
+        try {
+            line = br.readLine();
+        } catch (IOException e) {
+            line = null;
+//            e.printStackTrace();
+        }
+        if (line != null) {
+            line = masker.getMaskedLine(line) + '\n';
+            lineIdx = 0;
+        }
+    }
+}
diff --git a/plugin-common/src/com/tw/go/plugin/common/MaskingJobConsoleLogger.java b/plugin-common/src/com/tw/go/plugin/common/MaskingJobConsoleLogger.java
new file mode 100755
index 0000000..3e3a82b
--- /dev/null
+++ b/plugin-common/src/com/tw/go/plugin/common/MaskingJobConsoleLogger.java
@@ -0,0 +1,94 @@
+package com.tw.go.plugin.common;
+
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+/**
+ * Created by thomassc on 16.05.16.
+ */
+public class MaskingJobConsoleLogger extends JobConsoleLogger {
+    Set<String> maskValues = new HashSet<>();
+    String mask = "********";
+    String prefix = "";
+    MaskingInputStream misOutput;
+    MaskingInputStream misError;
+
+    public static MaskingJobConsoleLogger getConsoleLogger() {
+        if (context == null) throw new RuntimeException("context is null");
+        return new MaskingJobConsoleLogger();
+    }
+
+    public MaskingJobConsoleLogger withMask(String s) {
+        mask = s;
+        return this;
+    }
+
+    public MaskingJobConsoleLogger withRegexFilter(String s) {
+        if (!s.isEmpty()) {
+            maskValues.add(s);
+        }
+        return this;
+    }
+
+    public MaskingJobConsoleLogger withPrefix(String prefix) {
+        this.prefix = prefix;
+        return this;
+    }
+
+    public MaskingJobConsoleLogger withTextFilter(String s) {
+        if (!s.isEmpty()) {
+            maskValues.add("\\b" + Pattern.quote(s) + "\\b");
+        }
+        return this;
+    }
+
+    public MaskingJobConsoleLogger withMapFilter(Map<String, String> map) {
+        for (Map.Entry<String, String> e : map.entrySet()) {
+            if (context.environment().secureEnvSpecifier().isSecure(e.getKey())) {
+                withTextFilter(e.getValue());
+            }
+        }
+        return this;
+    }
+
+    public String mask(String line) {
+        for (String s : maskValues) {
+            line = line.replaceAll(s, mask);
+        }
+        return line;
+    }
+
+    public String getMaskedLine(String line) {
+        return prefix + mask(line);
+    }
+
+    @Override
+    public void printLine(String line) {
+        super.printLine(getMaskedLine(line));
+    }
+
+    @Override
+    public void readErrorOf(InputStream in) {
+        MaskingInputStream mis = new MaskingInputStream(in, this);
+        super.readErrorOf(mis);
+    }
+
+    @Override
+    public void readOutputOf(InputStream in) {
+        MaskingInputStream mis = new MaskingInputStream(in, this);
+        super.readOutputOf(mis);
+    }
+
+    @Override
+    public void printEnvironment(Map<String, String> environment) {
+        for (Map.Entry<String, String> e : environment.entrySet()) {
+            printLine(e.getKey() + ": " + e.getValue());
+        }
+    }
+}
diff --git a/plugin-common/src/com/tw/go/plugin/common/ParamParser.java b/plugin-common/src/com/tw/go/plugin/common/ParamParser.java
old mode 100644
new mode 100755
diff --git a/plugin-common/src/com/tw/go/plugin/common/ProcessOutput.java b/plugin-common/src/com/tw/go/plugin/common/ProcessOutput.java
new file mode 100755
index 0000000..8a08a52
--- /dev/null
+++ b/plugin-common/src/com/tw/go/plugin/common/ProcessOutput.java
@@ -0,0 +1,56 @@
+package com.tw.go.plugin.common;
+
+import java.util.List;
+
+import static com.tw.go.plugin.common.ListUtil.join;
+
+public class ProcessOutput {
+    private int returnCode;
+    private List<String> stdOut;
+    private List<String> stdErr;
+
+    public ProcessOutput(int returnCode, List<String> stdOut, List<String> stdErr) {
+        this.returnCode = returnCode;
+        this.stdOut = stdOut;
+        this.stdErr = stdErr;
+    }
+
+    public int getReturnCode() {
+        return returnCode;
+    }
+
+    public List<String> getStdOut() {
+        return stdOut;
+    }
+
+    public List<String> getStdErr() {
+        return stdErr;
+    }
+
+    public String getStdErrorAsString() {
+        if (hasErrors())
+            return "Error Message: " + join(getStdErr(), "\n");
+        return "";
+    }
+
+    public boolean isZeroReturnCode() {
+        return returnCode == 0;
+    }
+
+    public boolean hasOutput() {
+        return stdOut != null && !stdOut.isEmpty();
+    }
+
+    public boolean hasErrors() {
+        return stdErr != null && !stdErr.isEmpty();
+    }
+
+    @Override
+    public String toString() {
+        return "ProcessOutput{" +
+                "returnCode=" + returnCode +
+                ", stdOut=" + stdOut +
+                ", stdErr=" + stdErr +
+                '}';
+    }
+}
\ No newline at end of file
diff --git a/plugin-common/src/com/tw/go/plugin/common/ProcessRunner.java b/plugin-common/src/com/tw/go/plugin/common/ProcessRunner.java
new file mode 100755
index 0000000..17a091d
--- /dev/null
+++ b/plugin-common/src/com/tw/go/plugin/common/ProcessRunner.java
@@ -0,0 +1,78 @@
+package com.tw.go.plugin.common;
+
+import com.thoughtworks.go.plugin.api.logging.Logger;
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import org.apache.commons.io.IOUtils;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import static org.apache.commons.io.IOUtils.closeQuietly;
+
+/**
+ * Copied from https://github.com/gocd/go-plugins.git
+ */
+public class ProcessRunner {
+    private static final Logger logger = Logger.getLoggerFor(ProcessRunner.class);
+
+    public ProcessOutput execute(JobConsoleLogger console, boolean showConsoleOutput, String workingDir, List<String> command, Map<String, String> envMap) {
+        ProcessBuilder processBuilder = new ProcessBuilder(command);
+        Process process = null;
+        ProcessOutput processOutput = null;
+        long startTime = System.currentTimeMillis();
+        try {
+            logger.info(String.format("External process '%s' started", command.get(0)));
+            if (workingDir != null) {
+                processBuilder.directory(new File(workingDir));
+            }
+            processBuilder.redirectErrorStream(true).environment().putAll(envMap);
+            process = processBuilder.start();
+
+            if (showConsoleOutput) {
+                LinesInputStream output = new LinesInputStream(process.getInputStream());
+                console.readOutputOf(output);
+                int returnCode = process.waitFor();
+                waitUntilEmpty(2000, output, null);
+                processOutput = new ProcessOutput(returnCode, output.getLines(), new ArrayList<String>());
+            } else {
+                List output = IOUtils.readLines(process.getInputStream());
+                int returnCode = process.waitFor();
+                List pendingOutput = IOUtils.readLines(process.getInputStream());
+                output.addAll(pendingOutput);
+                processOutput = new ProcessOutput(returnCode, output, new ArrayList<String>());
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e.getMessage());
+        } finally {
+            if (process != null) {
+                closeQuietly(process.getInputStream());
+                closeQuietly(process.getErrorStream());
+                closeQuietly(process.getOutputStream());
+                process.destroy();
+                long estimatedTime = System.currentTimeMillis() - startTime;
+                logger.info(String.format("External process '%s' returned %d after %dms.", command.get(0), processOutput.getReturnCode(), estimatedTime));
+            }
+        }
+        return processOutput;
+    }
+
+    public void waitUntilEmpty(int timeout, LinesInputStream output, LinesInputStream error) throws InterruptedException {
+        int numOutLines = output.getLines().size();
+        int numErrLines = error != null ? error.getLines().size() : 0;
+        while (true) {
+            logger.info(String.format("Waiting %dms for stdour/stderr to settle ...", timeout));
+            Thread.sleep(timeout, 0);
+            int newNumOutLines = output.getLines().size();
+            int newNumErrLines = error != null ? error.getLines().size() : 0;
+            if (numOutLines == newNumOutLines && newNumErrLines == numErrLines) {
+                logger.info("stdour/stderr no longer changing");
+                break;
+            }
+            numOutLines = newNumOutLines;
+            numErrLines = newNumErrLines;
+        }
+    }
+}
diff --git a/plugin-common/src/com/tw/go/plugin/common/RequestData.java b/plugin-common/src/com/tw/go/plugin/common/RequestData.java
new file mode 100755
index 0000000..ac61fb9
--- /dev/null
+++ b/plugin-common/src/com/tw/go/plugin/common/RequestData.java
@@ -0,0 +1,13 @@
+package com.tw.go.plugin.common;
+
+import com.google.gson.GsonBuilder;
+
+import java.util.Map;
+
+public class RequestData {
+    protected Map<String,Map> executionRequest;
+
+    public RequestData(String payload) {
+        executionRequest = (Map) new GsonBuilder().create().fromJson(payload, Object.class);
+    }
+}
diff --git a/plugin-common/src/com/tw/go/plugin/common/Required.java b/plugin-common/src/com/tw/go/plugin/common/Required.java
new file mode 100644
index 0000000..c2b0d88
--- /dev/null
+++ b/plugin-common/src/com/tw/go/plugin/common/Required.java
@@ -0,0 +1,6 @@
+package com.tw.go.plugin.common;
+
+public enum Required
+{
+    YES, NO
+}
diff --git a/plugin-common/src/com/tw/go/plugin/common/Result.java b/plugin-common/src/com/tw/go/plugin/common/Result.java
old mode 100644
new mode 100755
index a047759..d74ba03
--- a/plugin-common/src/com/tw/go/plugin/common/Result.java
+++ b/plugin-common/src/com/tw/go/plugin/common/Result.java
@@ -12,13 +12,12 @@ public class Result {
     private Exception exception;
 
     public Result(boolean success, String message) {
-        this.success = success;
-        this.message = message;
+        this(success, message, null);
     }
 
-
     public Result(boolean success, String message, Exception exception) {
-        this(success, message);
+        this.success = success;
+        this.message = message;
         this.exception = exception;
     }
 
diff --git a/plugin-common/src/com/tw/go/plugin/common/Secure.java b/plugin-common/src/com/tw/go/plugin/common/Secure.java
new file mode 100644
index 0000000..5723dbe
--- /dev/null
+++ b/plugin-common/src/com/tw/go/plugin/common/Secure.java
@@ -0,0 +1,6 @@
+package com.tw.go.plugin.common;
+
+public enum Secure
+{
+    YES, NO
+}
diff --git a/plugin-common/src/com/tw/go/plugin/common/Selector.java b/plugin-common/src/com/tw/go/plugin/common/Selector.java
new file mode 100755
index 0000000..dc0f1a0
--- /dev/null
+++ b/plugin-common/src/com/tw/go/plugin/common/Selector.java
@@ -0,0 +1,79 @@
+package com.tw.go.plugin.common;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+/**
+ * Created by thomassc on 25.05.16.
+ */
+public class Selector {
+    Map map;
+
+    public Selector(Map map) {
+        this.map = map;
+    }
+
+    public Map getMap() {
+        return map;
+    }
+
+    // { "name":[ {"name":"value1"},{"name":"value2"} ]}
+    // "name"
+    // "name.name"
+    // "name[1].name"
+    public static <T> T select(Map map, String selector, Class<T> classType) {
+        Object node = map;
+        for (String fragment : selector.split("\\.")) {
+
+            String[] parts = fragment.split("[\\[\\]]");
+
+            if (node instanceof Map) {
+                node = ((Map) node).get(parts[0]);
+            } else {
+                node = null;
+            }
+
+            if (node == null) {
+                break;
+            }
+
+            if (parts.length > 1) {
+                int idx = Integer.parseInt(parts[1]);
+                node = ((ArrayList) node).get(idx);
+            }
+        }
+
+        if (node != null) {
+            if (node.getClass() == Double.class) {
+                if (classType == Integer.class) {
+                    node = ((Double) node).intValue();
+                } else if (classType == Long.class) {
+                    node = ((Double) node).longValue();
+                }
+            }
+        }
+
+        return classType.cast(node);
+    }
+
+    public static <T> T select(Map map, String selector, T defaultValue) {
+        T result = (T) select(map, selector, defaultValue.getClass());
+        return (result == null) ? defaultValue : result;
+    }
+
+    public static <T> T select(Map map, String selector) {
+        return (T) select(map, selector, Object.class);
+    }
+
+    public <T> T select(String selector, Class<T> classType) {
+        return Selector.select(map, selector, classType);
+    }
+
+    public <T> T select(String selector) {
+        return select(map,selector);
+    }
+
+    public <T> T select(String selector, T defaultValue) {
+        return select(map,selector,defaultValue);
+    }
+}
diff --git a/plugin-common/src/com/tw/go/plugin/common/TaskExecutor.java b/plugin-common/src/com/tw/go/plugin/common/TaskExecutor.java
old mode 100644
new mode 100755
index ed7a7d1..e89e7ae
--- a/plugin-common/src/com/tw/go/plugin/common/TaskExecutor.java
+++ b/plugin-common/src/com/tw/go/plugin/common/TaskExecutor.java
@@ -1,63 +1,106 @@
 package com.tw.go.plugin.common;
 
+import com.thoughtworks.go.plugin.api.logging.Logger;
 import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
 
-import java.util.Iterator;
-import java.util.Map;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.regex.Pattern;
 
 /**
  * Created by MarkusW on 10.11.2015.
  */
 public abstract class TaskExecutor {
 
+    public static final String REGEX_URL_CREDS = "(?<=://)[^:@]+(:[^@]+)?(?=@)";
+    public static final String GO_WORKING_DIRECTORY = "GO_WORKING_DIRECTORY";
+
     protected JobConsoleLogger console;
     protected Context context;
     protected Map config; // contains a key value pair <Key, Value> where Value is a map with content  {secure=boolean, value=string, required=boolean}
+    protected ConfigVars configVars;
+
+    public TaskExecutor(JobConsoleLogger console, Context context, Map config) {
+
+        // replace parameters and environment variables
+        replaceEnvVarsAndPropertiesInConfig(context, config);
+
+        Map<String, String> envVars = context.getEnvironmentVariables();
+
+        // So external commands work "in" the pipeline directory and not in some parent directory
+        AbstractCommand.setWorkingDir(context.getWorkingDir());
 
+        envVars.put(GO_WORKING_DIRECTORY,AbstractCommand.getAbsoluteWorkingDir());
+
+        HashSet<String> maskingList = new HashSet<>();
+        maskingList.add(REGEX_URL_CREDS);
+
+        configVars = expandConfigProperties(config, envVars, maskingList);
+
+        // yes, we ignore the "standard" console (for now) and just use the masking one ...
+        this.console = new MaskingJobConsoleLogger()
+                .withPrefix(getPluginLogPrefix())
+                .withMapFilter(envVars)
+                .withRegexFilter(REGEX_URL_CREDS);
+
+        // tbd: integrate "better". the following loop is only here because
+        // it was forgotten to be done "otherwise" :-(
+        for (String s : maskingList) {
+            ((MaskingJobConsoleLogger)this.console).withRegexFilter(s);
+        }
 
-    public TaskExecutor(JobConsoleLogger console, Context context, Map config){
-        this.console = console;
         this.context = context;
         this.config = config;
 
-        // Replace Parameters
-        replaceEnvVarsAndPropertiesInConfig(config);
+        for (String s : configVars.configKeys()) {
+            this.console.printLine("configuration setting '" + s + "' is '" + configVars.getValue(s) + "'");
+        }
+    }
 
-        // Log context
-        log(context.getEnvironmentVariables());
+    protected ConfigVars expandConfigProperties(Map<String, Map> config, Map<String, String> envVars, HashSet<String> maskingList) {
+        VarsExpander varsExpander = new VarsExpander(envVars);
+        for (Map.Entry<String, Map> e : config.entrySet()) {
+            String secure = e.getValue().get("secure").toString();
+            String value = e.getValue().get("value").toString();
+            String newValue = varsExpander.expand(value);
+            e.getValue().put("value", newValue);
+            if ("true".equals(secure) && (newValue.length() > 0)) {
+                maskingList.add("\\b" + Pattern.quote(newValue) + "\\b");
+            }
+        }
+        return new ConfigVars(config, envVars);
     }
 
+    public abstract Result execute() throws Exception;
+
     protected abstract String getPluginLogPrefix();
 
     protected void log(String message) {
-        this.console.printLine(getPluginLogPrefix() + message);
+        this.console.printLine(message);
     }
 
-    protected void log(Map map) {
-        Iterator it = map.entrySet().iterator();
-        while (it.hasNext()) {
-            Map.Entry entry = (Map.Entry)it.next();
-            this.console.printLine(getPluginLogPrefix() + entry.getKey() + " : " + entry.getValue());
-        }
+    protected void logException(Logger logger, Throwable throwable) throws UnsupportedEncodingException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        throwable.printStackTrace(new PrintStream(baos));
+        String output = baos.toString(StandardCharsets.UTF_8.name());
+        logger.error(throwable + "\n" + output);
     }
 
-    protected Map replaceEnvVarsAndPropertiesInConfig(Map config){
+    protected Map replaceEnvVarsAndPropertiesInConfig(Context context,Map config){
         Iterator it = config.entrySet().iterator();
         while (it.hasNext()) {
             Map.Entry entry = (Map.Entry)it.next();
+            EnvVarParamParser parser = new EnvVarParamParser(context.getEnvironmentVariables(), console);
             JobPropParamParser propParser = new JobPropParamParser(context.getEnvironmentVariables(), console);
 
             Map valueMap = (Map) entry.getValue();
             if (valueMap.containsKey("value")) {
-                String valueRaw = (String) valueMap.get("value");
-                String value = propParser.parse(valueRaw);
-                if (!value.equals(valueRaw))
-                {
-                    log("build value replaced in: " + entry.getKey());
-                }
-
+                String value = propParser.parse(parser.parse((String) valueMap.get("value")));
                 valueMap.put(GoApiConstants.PROPERTY_NAME_VALUE, value);
-
                 entry.setValue(valueMap);
             }
         }
diff --git a/plugin-common/src/com/tw/go/plugin/common/UnzipUtil.java b/plugin-common/src/com/tw/go/plugin/common/UnzipUtil.java
new file mode 100755
index 0000000..4552397
--- /dev/null
+++ b/plugin-common/src/com/tw/go/plugin/common/UnzipUtil.java
@@ -0,0 +1,61 @@
+package com.tw.go.plugin.common;
+
+import java.io.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+/**
+ * Created by thomassc on 17.05.16.
+ */
+public class UnzipUtil {
+
+    /**
+     * Size of the buffer to read/write data
+     */
+    private static final int BUFFER_SIZE = 4096;
+    /**
+     * Extracts an (Zip)InputStream to a directory specified by
+     * destDirectory (will be created if does not exists)
+     * @param inputStream
+     * @param destDirectory
+     * @throws IOException
+     */
+    public static void unzip(InputStream inputStream, String destDirectory) throws IOException {
+        File destDir = new File(destDirectory);
+        if (!destDir.exists()) {
+            destDir.mkdir();
+        }
+        ZipInputStream zipIn = new ZipInputStream(inputStream);
+        ZipEntry entry = zipIn.getNextEntry();
+        // iterates over entries in the zip file
+        while (entry != null) {
+            String filePath = destDirectory + File.separator + entry.getName();
+            if (!entry.isDirectory()) {
+                // if the entry is a file, extracts it
+                extractFile(zipIn, filePath);
+            } else {
+                // if the entry is a directory, make the directory
+                File dir = new File(filePath);
+                dir.mkdir();
+            }
+            zipIn.closeEntry();
+            entry = zipIn.getNextEntry();
+        }
+        zipIn.close();
+    }
+    /**
+     * Extracts a zip entry (file entry)
+     * @param zipIn
+     * @param filePath
+     * @throws IOException
+     */
+    private static void extractFile(ZipInputStream zipIn, String filePath) throws IOException {
+        BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(filePath));
+        byte[] bytesIn = new byte[BUFFER_SIZE];
+        int read = 0;
+        while ((read = zipIn.read(bytesIn)) != -1) {
+            bos.write(bytesIn, 0, read);
+        }
+        bos.close();
+    }
+}
\ No newline at end of file
diff --git a/plugin-common/src/com/tw/go/plugin/common/VarsExpander.java b/plugin-common/src/com/tw/go/plugin/common/VarsExpander.java
old mode 100644
new mode 100755
index 9e6b69e..8351703
--- a/plugin-common/src/com/tw/go/plugin/common/VarsExpander.java
+++ b/plugin-common/src/com/tw/go/plugin/common/VarsExpander.java
@@ -2,6 +2,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 public class VarsExpander {
     protected Map<String, String> vars;
@@ -23,6 +24,11 @@ public VarsExpander add(String key, String val)
     }
 
     public String expand(String raw)
+    {
+        return expand(raw,null);
+    }
+
+    public String expand(String raw, Set<String> found)
     {
         String newValue = "";
         int curr = 0;
@@ -48,8 +54,12 @@ public String expand(String raw)
 
             String id = raw.substring(next, end);
             String replace = vars.get(id);
-
-            newValue += replace;
+            if (replace != null) {
+                newValue += replace;
+                if (found != null) {
+                    found.add(id);
+                }
+            }
             curr = end + 1;
         }
 
@@ -57,4 +67,8 @@ public String expand(String raw)
 
         return newValue;
     }
+
+    public Map<String, String> getVars() {
+        return vars;
+    }
 }
\ No newline at end of file
diff --git a/plugin-common/test/com/tw/go/plugin/common/EnvVarParamParserTest.java b/plugin-common/test/com/tw/go/plugin/common/EnvVarParamParserTest.java
old mode 100644
new mode 100755
diff --git a/plugin-common/test/com/tw/go/plugin/common/GoApiClientTest.java b/plugin-common/test/com/tw/go/plugin/common/GoApiClientTest.java
old mode 100644
new mode 100755
index 3e9a082..ab9600f
--- a/plugin-common/test/com/tw/go/plugin/common/GoApiClientTest.java
+++ b/plugin-common/test/com/tw/go/plugin/common/GoApiClientTest.java
@@ -1,27 +1,20 @@
 package com.tw.go.plugin.common;
 
-import com.google.gson.JsonArray;
-import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
-import com.thoughtworks.go.plugin.api.task.TaskExecutionContext;
-import com.tw.go.plugin.common.mock.MockJobConsoleLogger;
-import com.tw.go.plugin.common.mock.MockTaskExecutionContext;
 import com.tw.go.plugin.common.utils.Environment;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.junit.*;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.security.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
 import java.util.Properties;
 
-import static org.junit.Assert.*;
-
 /**
  * Created by MarkusW on 18.11.2015.
  */
@@ -46,6 +39,15 @@ public void init() throws Exception{
     @Rule
     public final ExpectedException exception = ExpectedException.none();
 
+    @Test
+    public void convert() throws Exception {
+        String test = "1234.0";
+        float f = new Float(test);
+        System.out.println(f);
+        int i = (int)f;
+        System.out.println(i);
+    }
+
     @Test
     public void testGetJobProperty() throws Exception {
         // just read some properties from plugin test pipeline
@@ -55,6 +57,13 @@ public void testGetJobProperty() throws Exception {
         getJobProperty("cruise_pipeline_counter_bla");
     }
 
+    @Test
+    public void maskPwd() {
+        String s = "download https://theuser:blablubb@bitbucket.org/haufegroup/dummy-container.git and https://jenkins_build-haufe-lexware:UrH&uRJ4+Xb9@bitbucket.org/haufegroup/dummy-container.git to me.";
+        s = s.replaceAll("(?<=://)[^:@]+(:[^@]+)?(?=@)","*******");
+        System.out.println(s);
+        }
+
     @Test
     public void testSetJobProperty() throws Exception {
 
@@ -73,8 +82,8 @@ public void testSetJobProperty() throws Exception {
 
     @Test
     public void testGetJobProperties() throws Exception {
-        JSONObject obj = getJobProperties();
-        Assert.assertTrue(10 < obj.length());
+        Map obj = getJobProperties();
+        Assert.assertTrue(10 < obj.size());
 
     }
 
@@ -89,7 +98,7 @@ private String getJobProperty(String propertyName) throws Exception{
     }
 
     private String setJobProperty(String propertyName, String propertyValue) throws Exception{
-         return client.setJobProperty(
+        return client.setJobProperty(
                 envVars.get("GO_PIPELINE_NAME").toString(),
                 envVars.get("GO_PIPELINE_COUNTER").toString(),
                 envVars.get("GO_STAGE_NAME").toString(),
@@ -99,7 +108,7 @@ private String setJobProperty(String propertyName, String propertyValue) throws
                 propertyValue);
     }
 
-    private JSONObject getJobProperties() throws Exception{
+    private Map getJobProperties() throws Exception{
         return  client.getJobProperties(
                 envVars.get("GO_PIPELINE_NAME").toString(),
                 envVars.get("GO_PIPELINE_COUNTER").toString(),
diff --git a/plugin-common/test/com/tw/go/plugin/common/JobPropParamParserTest.java b/plugin-common/test/com/tw/go/plugin/common/JobPropParamParserTest.java
old mode 100644
new mode 100755
index 99b9be8..bb2bba3
--- a/plugin-common/test/com/tw/go/plugin/common/JobPropParamParserTest.java
+++ b/plugin-common/test/com/tw/go/plugin/common/JobPropParamParserTest.java
@@ -43,22 +43,21 @@ public void init() throws Exception{
             testPropertyValue3 = setJobProperty("test_property_TestPluginStage", "Test Value 3");
         }
         catch (IOException e){
-
         }
 
     }
 
 
 
-    @Test
-    public void testOnePropVarInParameter() throws Exception {
-        JobPropParamParser parser = new JobPropParamParser(context.getEnvironmentVariables(), mockConsole);
+   @Test
+   public void testOnePropVarInParameter() throws Exception {
+       JobPropParamParser parser = new JobPropParamParser(context.getEnvironmentVariables(), mockConsole);
 
-        Assert.assertEquals("Test Value 1", parser.parse("%{test_property_1}"));
-        Assert.assertEquals("abcTest Value 1", parser.parse("abc%{test_property_1}"));
-        Assert.assertEquals("Test Value 1abc", parser.parse("%{test_property_1}abc"));
-        Assert.assertEquals("abcTest Value 1abc", parser.parse("abc%{test_property_1}abc"));
-    }
+       Assert.assertEquals("Test Value 1", parser.parse("%{test_property_1}"));
+       Assert.assertEquals("abcTest Value 1", parser.parse("abc%{test_property_1}"));
+       Assert.assertEquals("Test Value 1abc", parser.parse("%{test_property_1}abc"));
+       Assert.assertEquals("abcTest Value 1abc", parser.parse("abc%{test_property_1}abc"));
+   }
 
     @Test
     public void testTwoPropVarsInParameter() throws Exception {
@@ -140,4 +139,4 @@ private String setJobProperty(String propertyName, String propertyValue) throws
                 propertyName,
                 propertyValue);
     }
-}
\ No newline at end of file
+}
diff --git a/plugin-common/test/com/tw/go/plugin/common/mock/MockJobConsoleLogger.java b/plugin-common/test/com/tw/go/plugin/common/mock/MockJobConsoleLogger.java
old mode 100644
new mode 100755
diff --git a/plugin-common/test/com/tw/go/plugin/common/mock/MockTaskExecutionContext.java b/plugin-common/test/com/tw/go/plugin/common/mock/MockTaskExecutionContext.java
old mode 100644
new mode 100755
diff --git a/plugin-common/test/com/tw/go/plugin/common/utils/Environment.java b/plugin-common/test/com/tw/go/plugin/common/utils/Environment.java
old mode 100644
new mode 100755
diff --git a/pom.xml b/pom.xml
old mode 100644
new mode 100755
index 83e585e..114b1b9
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,8 @@
     </scm>
 
     <properties>
-        <go.version>15.1.0</go.version>
+        <go.target.version>16.4.0</go.target.version>
+        <go.version>16.4.0</go.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- Sonar -->
@@ -29,7 +30,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.thoughtworks.go</groupId>
+            <groupId>cd.go.plugin</groupId>
             <artifactId>go-plugin-api</artifactId>
             <version>${go.version}</version>
             <scope>provided</scope>
@@ -65,6 +66,10 @@
         <module>sonar-qualitygates-plugin</module>
         <module>check_mk-plugin</module>
 		<module>docker-pipeline-plugin</module>
+        <module>fortify-plugin</module>
+        <module>fetch-any-artifact-plugin</module>
+        <module>docker-compose-plugin</module>
+        <module>docker-machine-plugin</module>
 
     </modules>
 
diff --git a/sonar-qualitygates-plugin/pom.xml b/sonar-qualitygates-plugin/pom.xml
old mode 100644
new mode 100755
index bd24cee..6e7942f
--- a/sonar-qualitygates-plugin/pom.xml
+++ b/sonar-qualitygates-plugin/pom.xml
@@ -5,12 +5,12 @@
 
     <groupId>com.thoughtworks.go</groupId>
     <artifactId>gocd-sonar-qualitygates-plugin</artifactId>
-    <version>1.0.0</version>
+    <version>2.0.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <go.target.version>15.1.0</go.target.version>
-        <go.version>15.1.0</go.version>
+        <go.target.version>16.9.0</go.target.version>
+        <go.version>16.9.0</go.version>
         <plugin.version>${project.version}</plugin.version>
 
         <sonar.java.coveragePlugin>cobertura</sonar.java.coveragePlugin>
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.thoughtworks.go</groupId>
             <artifactId>gocd-plugin-common</artifactId>
-            <version>${project.version}</version>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
diff --git a/sonar-qualitygates-plugin/resources/plugin.xml b/sonar-qualitygates-plugin/resources/plugin.xml
old mode 100644
new mode 100755
diff --git a/sonar-qualitygates-plugin/resources/test.properties b/sonar-qualitygates-plugin/resources/test.properties
old mode 100644
new mode 100755
diff --git a/sonar-qualitygates-plugin/resources/views/task.template.html b/sonar-qualitygates-plugin/resources/views/task.template.html
old mode 100644
new mode 100755
diff --git a/sonar-qualitygates-plugin/src/com/tw/go/task/sonarqualitygate/SonarClient.java b/sonar-qualitygates-plugin/src/com/tw/go/task/sonarqualitygate/SonarClient.java
old mode 100644
new mode 100755
index 5900cb0..e31e293
--- a/sonar-qualitygates-plugin/src/com/tw/go/task/sonarqualitygate/SonarClient.java
+++ b/sonar-qualitygates-plugin/src/com/tw/go/task/sonarqualitygate/SonarClient.java
@@ -20,12 +20,11 @@ public SonarClient(String apiUrl) throws GeneralSecurityException
 
     public JSONObject getProjectWithQualityGateDetails(String projectKey) throws Exception
     {
-        String uri = getApiUrl() + "/resources?resource=%1$s&metrics=quality_gate_details";
+        String uri = getApiUrl() + "/qualitygates/project_status?projectKey=%1$s";
         uri = String.format(uri, projectKey);
         String resultData = requestGet(uri);
 
-        JSONArray jsonArray = new JSONArray(resultData);
-        JSONObject jsonObject = jsonArray.getJSONObject(0);
+        JSONObject jsonObject = new JSONObject(resultData);
 
         return jsonObject;
     }
diff --git a/sonar-qualitygates-plugin/src/com/tw/go/task/sonarqualitygate/SonarParser.java b/sonar-qualitygates-plugin/src/com/tw/go/task/sonarqualitygate/SonarParser.java
old mode 100644
new mode 100755
index d85b8c1..288a214
--- a/sonar-qualitygates-plugin/src/com/tw/go/task/sonarqualitygate/SonarParser.java
+++ b/sonar-qualitygates-plugin/src/com/tw/go/task/sonarqualitygate/SonarParser.java
@@ -6,38 +6,34 @@
 /**
  * Created by MarkusW on 22.10.2015.
  */
-public class SonarParser
-{
+public class SonarParser {
     private JSONObject project;
 
-    public SonarParser(JSONObject projectResult){
+    public SonarParser(JSONObject projectResult) {
         this.project = projectResult;
     }
 
-    public JSONObject GetQualityGateDetails()
-    {
-        if (project.has("msr")) {
-            JSONArray msrList = project.getJSONArray("msr");
+    public String getProjectQualityGateStatus() {
+        if (project.has("projectStatus")) {
+            JSONObject projectStatus = project.getJSONObject("projectStatus");
+            if (projectStatus.has("status")) {
+                return projectStatus.getString("status");
+            }
+        }
+        return null;
+    }
 
-            for (int i = 0; i < msrList.length(); i++)
-            {
-                JSONObject msr = (JSONObject) msrList.get(i);
-                String key = msr.getString("key");
 
-                if("quality_gate_details".equals(key))
-                {
-                    String data = msr.getString("data");
-                    //data = data.replace("\\", "");
-                    JSONObject resultObj = new JSONObject(data);
-                    return resultObj;
+    public String getDate() {
+        if (project.has("projectStatus")) {
+            JSONObject projectStatus = project.getJSONObject("projectStatus");
+            if (projectStatus.has("periods")) {
+                JSONArray periods = projectStatus.getJSONArray("periods");
+                if (periods.length() > 0 && periods.getJSONObject(0).has("date")) {
+                    return periods.getJSONObject(0).getString("date");
                 }
-
             }
-
-
         }
         return null;
     }
-
-
 }
diff --git a/sonar-qualitygates-plugin/src/com/tw/go/task/sonarqualitygate/SonarScanTask.java b/sonar-qualitygates-plugin/src/com/tw/go/task/sonarqualitygate/SonarScanTask.java
old mode 100644
new mode 100755
index b769f1a..3494d27
--- a/sonar-qualitygates-plugin/src/com/tw/go/task/sonarqualitygate/SonarScanTask.java
+++ b/sonar-qualitygates-plugin/src/com/tw/go/task/sonarqualitygate/SonarScanTask.java
@@ -1,29 +1,20 @@
 
 package com.tw.go.task.sonarqualitygate;
 
+import com.google.gson.GsonBuilder;
 import com.thoughtworks.go.plugin.api.GoApplicationAccessor;
-import com.thoughtworks.go.plugin.api.GoPlugin;
 import com.thoughtworks.go.plugin.api.GoPluginIdentifier;
 import com.thoughtworks.go.plugin.api.annotation.Extension;
-import com.thoughtworks.go.plugin.api.exceptions.UnhandledRequestTypeException;
-import com.thoughtworks.go.plugin.api.logging.Logger;
 import com.thoughtworks.go.plugin.api.request.GoPluginApiRequest;
-import com.thoughtworks.go.plugin.api.response.DefaultGoApiResponse;
-import com.thoughtworks.go.plugin.api.response.DefaultGoPluginApiResponse;
 import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
-import com.thoughtworks.go.plugin.api.task.*;
-import com.tw.go.plugin.common.Context;
-import com.tw.go.plugin.common.GoApiConstants;
-import com.tw.go.plugin.common.Result;
-import org.apache.commons.io.IOUtils;
-import com.google.gson.GsonBuilder;
+import com.tw.go.plugin.common.*;
 
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Map;
+import java.util.Map;;
 
 @Extension
-public class SonarScanTask implements GoPlugin {
+public class SonarScanTask extends BaseGoPlugin {
 
     public static final String ISSUE_TYPE_FAIL = "IssueTypeFail";
     public static final String SONAR_API_URL = "SonarApiUrl";
@@ -32,113 +23,77 @@ public class SonarScanTask implements GoPlugin {
     public static final String JOB_NAME = "JobName";
     public static final String JOB_COUNTER = "JobCounter";
 
-    private static final Logger LOGGER = Logger.getLoggerFor(SonarScanTask.class);
-
     @Override
     public void initializeGoApplicationAccessor(GoApplicationAccessor goApplicationAccessor) {
         // not required in most plugins
     }
 
     @Override
-    public GoPluginApiResponse handle(GoPluginApiRequest request) throws UnhandledRequestTypeException {
-        switch (request.requestName()) {
-            case "configuration":
-                return handleGetConfigRequest();
-            case "validate":
-                return handleValidation();
-            case "execute":
-                return handleTaskExecution(request);
-            case "view":
-                return handleTaskView();
-            default:
-                throw new UnhandledRequestTypeException(request.requestName());
-        }
+    protected GoPluginApiResponse handleTaskView(GoPluginApiRequest request) {
+        return getViewResponse("SonarQube - Quality Gate",
+                getClass().getResourceAsStream("/views/task.template.html"));
     }
 
-    private GoPluginApiResponse handleTaskView() {
-        int responseCode = DefaultGoApiResponse.SUCCESS_RESPONSE_CODE;
-        HashMap view = new HashMap();
-        view.put("displayValue", "SonarQube - Quality Gate");
-        try {
-            view.put("template", IOUtils.toString(getClass().getResourceAsStream("/views/task.template.html"), "UTF-8"));
-        } catch (Exception e) {
-            responseCode = DefaultGoApiResponse.INTERNAL_ERROR;
-            String errorMessage = "Failed to find template: " + e.getMessage();
-            view.put("exception", errorMessage);
-            LOGGER.error(errorMessage, e);
-        }
-        return createResponse(responseCode, view);
+    @Override
+    protected GoPluginApiResponse handleGetConfigRequest(GoPluginApiRequest request) {
+        return success(getConfigDef());
+    }
+
+    @Override
+    protected GoPluginApiResponse handleValidation(GoPluginApiRequest request) {
+        HashMap result = new HashMap();
+        return success(result);
     }
 
-    private GoPluginApiResponse handleTaskExecution(GoPluginApiRequest request) {
+    protected GoPluginApiResponse handleTaskExecution(GoPluginApiRequest request) {
         Map executionRequest = (Map) new GsonBuilder().create().fromJson(request.requestBody(), Object.class);
-        Map config = (Map) executionRequest.get("config");
-        Map context = (Map) executionRequest.get("context");
 
-        SonarTaskExecutor executor = new SonarTaskExecutor(JobConsoleLogger.getConsoleLogger(), new Context(context), config );
+        Map<String, Map> config = (Map) executionRequest.get("config");
 
-        Result result = executor.execute();
-        return createResponse(result.responseCode(), result.toMap());
-    }
+        fixConfigAttrs(config,getConfigDef());
+
+        Context context = new Context((Map) executionRequest.get("context"));
+
+        Map<String, String> envVars = context.getEnvironmentVariables();
+
+        SonarTaskExecutor executor = new SonarTaskExecutor(
+                MaskingJobConsoleLogger.getConsoleLogger(), context, config);
 
-    private GoPluginApiResponse handleValidation() {
-        HashMap validationResult = new HashMap();
-        int responseCode = DefaultGoPluginApiResponse.SUCCESS_RESPONSE_CODE;
+        // The RESPONSE_CODE MUST be 200 (SUCCESS) to be processed by Go.CD
+        // The outcome is defined by the property "success", and the cause can be stored in "message"
+        // See
+        //  public <T> T submitRequest(String pluginId, String requestName, PluginInteractionCallback<T> pluginInteractionCallback) {
+        // in
+        //  .../gocd/plugin-infra/go-plugin-access/src/com/thoughtworks/go/plugin/access/PluginRequestHelper.java
+
+        try {
+            Result result = executor.execute();
+            return success(result.toMap());
+        } catch (Exception e) {
+            Result result = new Result(false,e.getMessage());
+            return success(result.toMap());
+        }
 
-        return createResponse(responseCode, validationResult);
     }
 
-    // return json description to tell go.cd which config properties need to be stored
-    // sample and schema can be found at http://www.go.cd/documentation/developer/writing_go_plugins/task/version_1_0/configuration.html
-    private GoPluginApiResponse handleGetConfigRequest() {
-
-        HashMap config = new HashMap();
-
-        HashMap stageName = new HashMap();
-        stageName.put(GoApiConstants.PROPERTY_NAME_DISPLAY_ORDER, "1");
-        stageName.put(GoApiConstants.PROPERTY_NAME_DISPLAY_NAME, "Stage name");
-        stageName.put(GoApiConstants.PROPERTY_NAME_REQUIRED, false);
-        config.put(STAGE_NAME, stageName);
-
-        HashMap jobName = new HashMap();
-        jobName.put(GoApiConstants.PROPERTY_NAME_DISPLAY_ORDER, "2");
-        jobName.put(GoApiConstants.PROPERTY_NAME_DISPLAY_NAME, "Job name");
-        jobName.put(GoApiConstants.PROPERTY_NAME_REQUIRED, false);
-        config.put(JOB_NAME, jobName);
-
-        HashMap stageCounter = new HashMap();
-        stageCounter.put(GoApiConstants.PROPERTY_NAME_DEFAULT_VALUE, "1");
-        stageCounter.put(GoApiConstants.PROPERTY_NAME_DISPLAY_ORDER, "3");
-        stageCounter.put(GoApiConstants.PROPERTY_NAME_DISPLAY_NAME, "Stage counter");
-        stageCounter.put(GoApiConstants.PROPERTY_NAME_REQUIRED, false);
-        config.put(JOB_COUNTER, stageCounter);
-
-        HashMap sonarProjectKey = new HashMap();
-        sonarProjectKey.put(GoApiConstants.PROPERTY_NAME_DISPLAY_ORDER, "4");
-        sonarProjectKey.put(GoApiConstants.PROPERTY_NAME_DISPLAY_NAME, "Key of the SonarQube project");
-        sonarProjectKey.put(GoApiConstants.PROPERTY_NAME_REQUIRED, false);
-        config.put(SONAR_PROJECT_KEY, sonarProjectKey);
-
-        HashMap issueTypeFail = new HashMap();
-        issueTypeFail.put(GoApiConstants.PROPERTY_NAME_DEFAULT_VALUE, "error");
-        issueTypeFail.put(GoApiConstants.PROPERTY_NAME_DISPLAY_ORDER, "5");
-        issueTypeFail.put(GoApiConstants.PROPERTY_NAME_DISPLAY_NAME, "Fail Quality Gate result");
-        issueTypeFail.put(GoApiConstants.PROPERTY_NAME_REQUIRED, false);
-        config.put(ISSUE_TYPE_FAIL, issueTypeFail);
-
-        HashMap sonarApiUrl = new HashMap();
-        sonarApiUrl.put(GoApiConstants.PROPERTY_NAME_DISPLAY_ORDER, "6");
-        sonarApiUrl.put(GoApiConstants.PROPERTY_NAME_DISPLAY_NAME, "Sonar Api Url");
-        sonarApiUrl.put(GoApiConstants.PROPERTY_NAME_REQUIRED, true);
-        config.put(SONAR_API_URL, sonarApiUrl);
-
-        return createResponse(DefaultGoPluginApiResponse.SUCCESS_RESPONSE_CODE, config);
+    private void fixConfigAttrs(Map<String, Map> configAct, Map<String, Map> configDef) {
+        for (Map.Entry<String,Map> e : configAct.entrySet()) {
+            Map def = configDef.get(e.getKey());
+            Map act = e.getValue();
+            act.put("required",def.get("required"));
+            act.put("secure",def.get("secure"));
+        }
     }
 
-    private GoPluginApiResponse createResponse(int responseCode, Map body) {
-        final DefaultGoPluginApiResponse response = new DefaultGoPluginApiResponse(responseCode);
-        response.setResponseBody(new GsonBuilder().serializeNulls().create().toJson(body));
-        return response;
+    private Map getConfigDef() {
+        return new ConfigDef()
+                .add(STAGE_NAME, "", Required.NO)
+                .add(JOB_NAME, "", Required.NO)
+                .add(JOB_COUNTER, "", Required.NO)
+                .add(SONAR_PROJECT_KEY, "", Required.YES)
+                .add(ISSUE_TYPE_FAIL, "error", Required.YES)
+                .add(SONAR_API_URL, "", Required.YES)
+                .toMap();
     }
 
     @Override
diff --git a/sonar-qualitygates-plugin/src/com/tw/go/task/sonarqualitygate/SonarTaskExecutor.java b/sonar-qualitygates-plugin/src/com/tw/go/task/sonarqualitygate/SonarTaskExecutor.java
old mode 100644
new mode 100755
index bc8955a..3277ad5
--- a/sonar-qualitygates-plugin/src/com/tw/go/task/sonarqualitygate/SonarTaskExecutor.java
+++ b/sonar-qualitygates-plugin/src/com/tw/go/task/sonarqualitygate/SonarTaskExecutor.java
@@ -2,10 +2,12 @@
 package com.tw.go.task.sonarqualitygate;
 
 
-import com.thoughtworks.go.plugin.api.task.*;
-import com.tw.go.plugin.common.*;
+import com.thoughtworks.go.plugin.api.task.JobConsoleLogger;
+import com.tw.go.plugin.common.Context;
+import com.tw.go.plugin.common.GoApiClient;
+import com.tw.go.plugin.common.GoApiConstants;
+import com.tw.go.plugin.common.Result;
 import com.tw.go.plugin.common.TaskExecutor;
-import org.json.JSONObject;
 
 import java.security.GeneralSecurityException;
 import java.util.Map;
@@ -16,101 +18,108 @@ public SonarTaskExecutor(JobConsoleLogger console, Context context, Map config)
         super(console, context, config);
     }
 
-    public Result execute() {
+    public Result execute() throws Exception {
 
         String sonarProjectKey = (String) ((Map) this.config.get(SonarScanTask.SONAR_PROJECT_KEY)).get(GoApiConstants.PROPERTY_NAME_VALUE);
         log("checking quality gate result for: " + sonarProjectKey);
 
         try {
             // get input parameter
-            String stageName = (String) ((Map)this.config.get(SonarScanTask.STAGE_NAME)).get(GoApiConstants.PROPERTY_NAME_VALUE);
-            String jobName = (String) ((Map)this.config.get(SonarScanTask.JOB_NAME)).get(GoApiConstants.PROPERTY_NAME_VALUE);
-            String jobCounter = (String) ((Map)this.config.get(SonarScanTask.JOB_COUNTER)).get(GoApiConstants.PROPERTY_NAME_VALUE);
+            String stageName = (String) ((Map) this.config.get(SonarScanTask.STAGE_NAME)).get(GoApiConstants.PROPERTY_NAME_VALUE);
+            String jobName = (String) ((Map) this.config.get(SonarScanTask.JOB_NAME)).get(GoApiConstants.PROPERTY_NAME_VALUE);
+            String jobCounter = (String) ((Map) this.config.get(SonarScanTask.JOB_COUNTER)).get(GoApiConstants.PROPERTY_NAME_VALUE);
 
-            String sonarApiUrl = (String) ((Map)this.config.get(SonarScanTask.SONAR_API_URL)).get(GoApiConstants.PROPERTY_NAME_VALUE);
+            String sonarApiUrl = (String) ((Map) this.config.get(SonarScanTask.SONAR_API_URL)).get(GoApiConstants.PROPERTY_NAME_VALUE);
             log("API Url: " + sonarApiUrl);
             String issueTypeFail = (String) ((Map) this.config.get(SonarScanTask.ISSUE_TYPE_FAIL)).get(GoApiConstants.PROPERTY_NAME_VALUE);
             log("Fail if: " + issueTypeFail);
 
             SonarClient sonarClient = new SonarClient(sonarApiUrl);
 
-            // get quality gate details
-            JSONObject result = sonarClient.getProjectWithQualityGateDetails(sonarProjectKey);
+//            // This might need some auth!
+//            Map envVars = context.getEnvironmentVariables();
+//            if (envVars.get(GoApiConstants.ENVVAR_NAME_SONAR_USER) != null &&
+//                    envVars.get(GoApiConstants.ENVVAR_NAME_SONAR_USER_PASSWORD) != null) {
+//
+//                sonarClient.setBasicAuthentication(envVars.get(GoApiConstants.ENVVAR_NAME_SONAR_USER).toString(), envVars.get(GoApiConstants.ENVVAR_NAME_SONAR_USER_PASSWORD).toString());
+//                log("Logged in as '" + envVars.get(GoApiConstants.ENVVAR_NAME_SONAR_USER).toString() + "' to get the project's quality gate");
+//            } else {
+//                log(" Requesting project's quality gate anonymously.");
+//            }
 
-            if (!(stageName == null) && !(jobName == null) && !(jobCounter == null)) {
+            // get quality gate details
 
+            SonarParser parser = new SonarParser(sonarClient.getProjectWithQualityGateDetails(sonarProjectKey));
+            if (!("".equals(stageName)) && !("".equals(jobName)) && !("".equals(jobCounter))) {
                 String scheduledTime = getScheduledTime();
-                String resultDate = result.getString("date");
-                resultDate = new StringBuilder(resultDate).insert(resultDate.length()-2, ":").toString();
+                String resultDate = parser.getDate();
+                resultDate = new StringBuilder(resultDate).insert(resultDate.length() - 2, ":").toString();
 
                 int timeout = 0;
                 int timeoutTime = 60000;
                 int timeLimit = 300000;
 
-                while(compareDates(resultDate, scheduledTime) <= 0) {
+                while (compareDates(resultDate, scheduledTime) <= 0) {
 
-                    log("Nessus scan result is older than the start of the pipeline. Waiting for a newer scan ...");
-
-                    result = sonarClient.getProjectWithQualityGateDetails(sonarProjectKey);
-                    timeout = timeout + timeoutTime;
+                    log("Scan result is older than the start of the pipeline. Waiting for a newer scan ...");
 
-                    resultDate = result.getString("date");
-                    resultDate = new StringBuilder(resultDate).insert(resultDate.length()-2, ":").toString();
 
                     if (timeout > timeLimit) {
 
                         log("No new scan has been found !");
 
+                        log("Date of Sonar scan: " + parser.getDate());
+
                         return new Result(false, "Failed to get a newer quality gate for " + sonarProjectKey
                                 + ". The present quality gate is older than the start of the Sonar scan task.");
                     }
 
                     Thread.sleep(timeoutTime);
 
+                    parser = new SonarParser(sonarClient.getProjectWithQualityGateDetails(sonarProjectKey));
+
+                    timeout = timeout + timeoutTime;
+
+                    resultDate = parser.getDate();
+                    resultDate = new StringBuilder(resultDate).insert(resultDate.length() - 2, ":").toString();
                 }
 
-                SonarParser parser = new SonarParser(result);
+                log("Date of Sonar scan: " + parser.getDate());
 
-                // check that a quality gate is returned
-                JSONObject qgDetails = parser.GetQualityGateDetails();
 
-                String qgResult = qgDetails.getString("level");
+                // check that a quality gate is returned
+                String qgResult = parser.getProjectQualityGateStatus();
 
                 // get result issues
                 return parseResult(qgResult, issueTypeFail);
 
-            }
-            else {
+            } else {
 
-                SonarParser parser = new SonarParser(result);
+                log("Date of Sonar scan: " + parser.getDate());
 
                 // check that a quality gate is returned
-                JSONObject qgDetails = parser.GetQualityGateDetails();
-
-                String qgResult = qgDetails.getString("level");
+                String qgResult = parser.getProjectQualityGateStatus();
 
                 // get result issues
                 return parseResult(qgResult, issueTypeFail);
             }
 
         } catch (Exception e) {
-            log("Error during get or parse of quality gate result. Please check if a quality gate is defined" + e.getMessage());
-            return new Result(false, "Failed to get quality gate for " + sonarProjectKey + ". Please check if a quality gate is defined", e);
+            log("Error during get or parse of quality gate result. Please check if a quality gate is defined\n" + e.getMessage());
+            return new Result(false, "Failed to get quality gate for " + sonarProjectKey + ". Please check if a quality gate is defined\n", e);
         }
     }
 
     private Result parseResult(String qgResult, String issueTypeFail) {
 
         switch (issueTypeFail) {
-            case "error" :
-                if("ERROR".equals(qgResult))
-                {
+            case "error":
+                if ("ERROR".equals(qgResult)) {
                     return new Result(false, "At least one Error in Quality Gate");
                 }
                 break;
-            case "warning" :
-                if("ERROR".equals(qgResult) || "WARN".equals(qgResult))
-                {
+            case "warning":
+                if ("ERROR".equals(qgResult) || "WARN".equals(qgResult)) {
                     return new Result(false, "At least one Error or Warning in Quality Gate");
                 }
                 break;
@@ -121,7 +130,6 @@ private Result parseResult(String qgResult, String issueTypeFail) {
     protected String getScheduledTime() throws GeneralSecurityException {
         Map envVars = context.getEnvironmentVariables();
         GoApiClient client = new GoApiClient(envVars.get(GoApiConstants.ENVVAR_NAME_GO_SERVER_URL).toString());
-
         try {
             // get go build user authorization
             if (envVars.get(GoApiConstants.ENVVAR_NAME_GO_BUILD_USER) != null &&
@@ -129,34 +137,33 @@ protected String getScheduledTime() throws GeneralSecurityException {
 
                 client.setBasicAuthentication(envVars.get(GoApiConstants.ENVVAR_NAME_GO_BUILD_USER).toString(), envVars.get(GoApiConstants.ENVVAR_NAME_GO_BUILD_USER_PASSWORD).toString());
 
-                log("Authorization set");
+                log("Logged in as '" + envVars.get(GoApiConstants.ENVVAR_NAME_GO_BUILD_USER).toString() + "'");
+            } else {
+                log("No login set. Going anonymous.");
             }
 
             String scheduledTime = client.getJobProperty(
                     envVars.get("GO_PIPELINE_NAME").toString(),
                     envVars.get("GO_PIPELINE_COUNTER").toString(),
-                    (String) ((Map)this.config.get(SonarScanTask.STAGE_NAME)).get(GoApiConstants.PROPERTY_NAME_VALUE),
-                    (String) ((Map)this.config.get(SonarScanTask.JOB_COUNTER)).get(GoApiConstants.PROPERTY_NAME_VALUE),
-                    (String) ((Map)this.config.get(SonarScanTask.JOB_NAME)).get(GoApiConstants.PROPERTY_NAME_VALUE),
+                    (String) ((Map) this.config.get(SonarScanTask.STAGE_NAME)).get(GoApiConstants.PROPERTY_NAME_VALUE),
+                    (String) ((Map) this.config.get(SonarScanTask.JOB_COUNTER)).get(GoApiConstants.PROPERTY_NAME_VALUE),
+                    (String) ((Map) this.config.get(SonarScanTask.JOB_NAME)).get(GoApiConstants.PROPERTY_NAME_VALUE),
                     "cruise_timestamp_01_scheduled");
 
             return scheduledTime;
 
-        }
-        catch(Exception e)
-        {
+        } catch (Exception e) {
             log(e.toString());
-            return "0";
+            return null;
         }
     }
 
-    protected int compareDates(String date1, String date2)
-    {
+    protected int compareDates(String date1, String date2) {
         return (date1.compareTo(date2));
     }
 
-    protected String getPluginLogPrefix(){
+    protected String getPluginLogPrefix() {
         return "[SonarQube Quality Gate Plugin] ";
     }
 
- }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/sonar-qualitygates-plugin/test/com/tw/go/task/sonarqualitygate/SonarClientTest.java b/sonar-qualitygates-plugin/test/com/tw/go/task/sonarqualitygate/SonarClientTest.java
old mode 100644
new mode 100755
index e168ab7..8b7d357
--- a/sonar-qualitygates-plugin/test/com/tw/go/task/sonarqualitygate/SonarClientTest.java
+++ b/sonar-qualitygates-plugin/test/com/tw/go/task/sonarqualitygate/SonarClientTest.java
@@ -8,6 +8,8 @@
 import java.io.InputStream;
 import java.util.Properties;
 
+import static junit.framework.TestCase.assertEquals;
+
 /**
  * Created by MarkusW on 26.10.2015.
  */
@@ -31,6 +33,7 @@ public static void init() throws Exception{
         SonarClientTest.sonarProjectKey = props.getProperty("sonarProjectKey");
     }
 
+    @Test
     public void testQualityGateResult() throws Exception {
 
         // create a sonar client
@@ -42,10 +45,10 @@ public void testQualityGateResult() throws Exception {
         SonarParser parser = new SonarParser(result);
 
         // check that a quality gate is returned
-        JSONObject qgDetails = parser.GetQualityGateDetails();
+        String qgResult = parser.getProjectQualityGateStatus();
+        assertEquals("OK", qgResult);
 
-        String qgResult = qgDetails.getString("level");
-        Assert.assertEquals("ERROR", qgResult);
+        assertEquals("2018-01-26T12:32:07+0000", parser.getDate());
     }
 
 }
\ No newline at end of file