diff --git a/README.md b/README.md
index 63a0915b..4768e5bb 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,3 @@
 Sample Java Applicaiton V3.6
+This app is perfect for testing DevOps training
+So Cool
diff --git a/jenkins/Jenkinsfile-CI b/jenkins/Jenkinsfile-CI
index 583c905d..ebfeda6a 100644
--- a/jenkins/Jenkinsfile-CI
+++ b/jenkins/Jenkinsfile-CI
@@ -1,51 +1,67 @@
-pipeline {
-    agent any
-    stages {
-        stage('compile') {
-	   steps {
-                echo 'compiling..'
-		git url: 'https://github.com/lerndevops/samplejavaapp'
-		sh script: '/opt/maven/bin/mvn compile'
-           }
-        }
-        stage('codereview-pmd') {
-	   steps {
-                echo 'codereview..'
-		sh script: '/opt/maven/bin/mvn -P metrics pmd:pmd'
-           }
-	   post {
-               success {
-		   recordIssues enabledForFailure: true, tool: pmdParser(pattern: '**/target/pmd.xml')
-               }
-           }		
-        }
-        stage('unit-test') {
-	   steps {
-                echo 'unittest..'
-	        sh script: '/opt/maven/bin/mvn test'
-                 }
-	   post {
-               success {
-                   junit 'target/surefire-reports/*.xml'
-               }
-           }			
-        }
-        stage('codecoverage') {
-	   steps {
-                echo 'unittest..'
-	        sh script: '/opt/maven/bin/mvn verify'
-                 }
-	   post {
-               success {
-                   jacoco buildOverBuild: true, deltaBranchCoverage: '20', deltaClassCoverage: '20', deltaComplexityCoverage: '20', deltaInstructionCoverage: '20', deltaLineCoverage: '20', deltaMethodCoverage: '20'
-               }
-           }			
-        }
-        stage('package') {
-	   steps {
-                echo 'package......'
-		sh script: '/opt/maven/bin/mvn package'	
-           }		
-        }
+pipeline{
+	agent any
+	tools {
+ 		 maven 'Maven'
+	}
+
+  
+  stages {
+  stage('codecompile') {
+    steps {
+    git branch: 'master', url: 'https://github.com/gillespatrick/samplejavaapp/'
+    sh 'mvn compile'
     }
+
+     }
+
+  stage('codereview') {
+    steps {
+    sh 'mvn -P metrics pmd:pmd '
+    }
+
+    post {
+      always {
+        recordIssues sourceCodeRetention: 'LAST_BUILD', tools: [pmdParser(pattern: '**/pmd.xml')]
+      }
+    }
+  }
+
+  stage('codetest') {
+    steps {
+      sh 'mvn test'
+      }
+
+    post {
+      always {
+       junit stdioRetention: '', testResults: 'target/surefire-reports/*.xml '
+       }
+    }
+  }
+
+  stage('codecoverage') {
+    steps {
+     sh 'mvn verify'
+    }
+
+    post {
+      always {
+        jacoco()
+      }
+    }
+  }
+
+  stage('codepackage') {
+    steps {
+      sh 'mvn package'
+    }
+
+    post {
+      always {
+        archiveArtifacts artifacts: 'target/*.war', followSymlinks: false
+      }
+    }
+  }
+
+}
+
 }
diff --git a/jenkinsfile b/jenkinsfile
new file mode 100644
index 00000000..536bd037
--- /dev/null
+++ b/jenkinsfile
@@ -0,0 +1,57 @@
+pipeline{
+	agent any
+	tools {
+ 		 maven 'Maven'
+	}
+
+  
+  
+  stages {
+  stage('codecompile') {
+    steps {
+    git branch: 'master', url: 'https://github.com/gillespatrick/samplejavaapp/'
+    sh 'mvn compile'
+    }
+
+     }
+
+  stage('codereview') {
+    steps {
+    sh 'mvn -P metrics pmd:pmd '
+    }
+
+    post {
+      always {
+        recordIssues sourceCodeRetention: 'LAST_BUILD', tools: [pmdParser(pattern: '**/pmd.xml')]
+      }
+    }
+  }
+
+  stage('codetest') {
+    steps {
+      sh 'mvn test'
+      }
+
+    post {
+      always {
+       junit stdioRetention: '', testResults: 'target/surefire-reports/*.xml '
+       }
+    }
+  }
+
+
+
+  stage('codepackage') {
+    steps {
+      sh 'mvn package'
+    }
+	  post {
+      always {
+        archiveArtifacts artifacts: 'target/*.war', followSymlinks: false
+      }
+    }
+  }
+
+}
+
+}
diff --git a/src/main/java/com/devopsdemo/tutorial/addressbook/AddressbookUI.java b/src/main/java/com/devopsdemo/tutorial/addressbook/AddressbookUI.java
index 4bebc796..d49f29c2 100644
--- a/src/main/java/com/devopsdemo/tutorial/addressbook/AddressbookUI.java
+++ b/src/main/java/com/devopsdemo/tutorial/addressbook/AddressbookUI.java
@@ -18,6 +18,7 @@
 import com.vaadin.v7.ui.Grid;
 import com.vaadin.v7.ui.TextField;
 
+
 /* User Interface written in Java.
  *
  * Define the user interface shown on the Vaadin generated web page by extending the UI class.
@@ -27,7 +28,8 @@
 @Title("sampleapp")
 @Theme("valo")
 @Widgetset("com.vaadin.v7.Vaadin7WidgetSet")
-public class AddressbookUI extends UI {
+    public class AddressbookUI extends UI {
+
 
     /*
      * Hundreds of widgets. Vaadin's user interface components are just Java