diff --git a/build.gradle b/build.gradle
index 8cebbfe..7203b1a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,6 +7,10 @@ buildscript {
     }
 }
 
+repositories {
+    mavenCentral()
+}
+
 ext {
     sonatypeUser = System.env.SONATYPE_USER
     sonatypePass = System.env.SONATYPE_PASS
@@ -19,9 +23,15 @@ apply plugin: 'release'
 
 group 'org.scoverage'
 
+configurations {
+    scoverage
+    compile.extendsFrom scoverage
+}
+
 dependencies {
     compile gradleApi()
     compile localGroovy()
+    scoverage 'org.scoverage:scalac-scoverage-plugin_2.10:0.99.5'
 }
 
 task groovydocJar(type: Jar, dependsOn: groovydoc) {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..3c7abdf
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..985fdd5
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Jun 16 21:08:06 BST 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..aec9973
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..e1ccb34
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name='gradle-scoverage'
\ No newline at end of file
diff --git a/src/main/groovy/org/scoverage/OverallCheckTask.groovy b/src/main/groovy/org/scoverage/OverallCheckTask.groovy
index 89572cf..4831156 100644
--- a/src/main/groovy/org/scoverage/OverallCheckTask.groovy
+++ b/src/main/groovy/org/scoverage/OverallCheckTask.groovy
@@ -13,9 +13,9 @@ class OverallCheckTask extends DefaultTask {
 
     @TaskAction
     void requireLineCoverage() {
-        def dataDirName = project.extensions[ScoveragePlugin.CONFIGURATION_NAME].dataDirName
+        def extension = ScoveragePlugin.extensionIn(project)
 
-        if (cobertura == null) cobertura = project.file("$project.buildDir/reports/$dataDirName/cobertura.xml")
+        if (cobertura == null) cobertura = new File(extension.dataDir, 'cobertura.xml')
 
         def xml = new XmlParser().parse(cobertura)
         def overallLineRate = xml.attribute('line-rate').toDouble()
diff --git a/src/main/groovy/org/scoverage/ScoverageExtension.groovy b/src/main/groovy/org/scoverage/ScoverageExtension.groovy
index 999b7b0..ee0b596 100644
--- a/src/main/groovy/org/scoverage/ScoverageExtension.groovy
+++ b/src/main/groovy/org/scoverage/ScoverageExtension.groovy
@@ -2,8 +2,10 @@ package org.scoverage
 
 import org.gradle.api.Action
 import org.gradle.api.Project
+import org.gradle.api.artifacts.ResolvedConfiguration
 import org.gradle.api.plugins.JavaPlugin
 import org.gradle.api.plugins.scala.ScalaPlugin
+import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.testing.Test
 
@@ -14,6 +16,14 @@ import org.gradle.api.tasks.testing.Test
  */
 class ScoverageExtension {
 
+    /** a directory to write working files to */
+    File dataDir
+    /** a directory to write final output to */
+    File reportDir
+    /** sources to highlight */
+    SourceSet sourceSet
+
+
     ScoverageExtension(Project project) {
 
         project.plugins.apply(JavaPlugin.class);
@@ -22,11 +32,11 @@ class ScoverageExtension {
 
         project.configurations.create(ScoveragePlugin.CONFIGURATION_NAME) {
             visible = false
-            transitive = false
+            transitive = true
             description = 'Scoverage dependencies'
         }
 
-        project.sourceSets.create(ScoveragePlugin.CONFIGURATION_NAME) {
+        sourceSet = project.sourceSets.create(ScoveragePlugin.CONFIGURATION_NAME) {
             def mainSourceSet = project.sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME)
 
             java.source(mainSourceSet.java)
@@ -44,34 +54,63 @@ class ScoverageExtension {
             dependsOn(project.tasks[ScoveragePlugin.TEST_NAME])
         }
 
+        project.tasks.create(ScoveragePlugin.REPORT_NAME, JavaExec.class) {
+            dependsOn(project.tasks[ScoveragePlugin.TEST_NAME])
+        }
+
+        dataDir = new File(project.buildDir, 'scoverage')
+        reportDir = new File(project.buildDir, 'reports' + File.separatorChar + 'scoverage')
+
     }
 
     private Action<Project> configureRuntimeOptions = new Action<Project>() {
 
         @Override
         void execute(Project t) {
+
+            def extension = ScoveragePlugin.extensionIn(t)
+            extension.dataDir.mkdirs()
+            extension.reportDir.mkdirs()
+
+            ResolvedConfiguration s = t.configurations[ScoveragePlugin.CONFIGURATION_NAME].resolvedConfiguration
+            String pluginPath = s.getFirstLevelModuleDependencies().iterator().next().moduleArtifacts.iterator().next().file.absolutePath
+
             t.tasks[ScoveragePlugin.COMPILE_NAME].configure {
-                List<String> plugin = ['-Xplugin:' + t.configurations[ScoveragePlugin.CONFIGURATION_NAME].singleFile]
+
+
+                List<String> plugin = ['-Xplugin:' + pluginPath]
                 List<String> parameters = scalaCompileOptions.additionalParameters
                 if (parameters != null) {
                     plugin.addAll(parameters)
                 }
+                plugin.add("-P:scoverage:dataDir:${extension.dataDir.absolutePath}".toString())
+                plugin.add('-P:scoverage:excludedPackages:')
                 scalaCompileOptions.additionalParameters = plugin
                 // exclude the scala libraries that are added to enable scala version detection
                 classpath += t.configurations[ScoveragePlugin.CONFIGURATION_NAME]
             }
-            t.tasks[ScoveragePlugin.TEST_NAME].configure {
-                // TODO : fix this
-                systemProperty 'scoverage.dataDir', "${t.buildDir}/reports/${t.extensions[ScoveragePlugin.CONFIGURATION_NAME].dataDirName}"
-                systemProperty 'scoverage.basedir', "${t.rootDir.absolutePath}"  // for multi-module checking
 
+            t.tasks[ScoveragePlugin.TEST_NAME].configure {
                 def existingClasspath = classpath
                 classpath = t.files(t.sourceSets[ScoveragePlugin.CONFIGURATION_NAME].output.classesDir) +
-                project.configurations[ScoveragePlugin.CONFIGURATION_NAME] +
-                existingClasspath
+                        project.configurations[ScoveragePlugin.CONFIGURATION_NAME] +
+                        existingClasspath
+            }
+
+            t.tasks[ScoveragePlugin.REPORT_NAME].configure {
+                classpath = project.buildscript.configurations.classpath +
+                        project.configurations[ScoveragePlugin.CONFIGURATION_NAME]
+                main = 'org.scoverage.ScoverageReport'
+                args = [
+                        extension.sourceSet.allSource.iterator().next().absolutePath,
+                        extension.dataDir.absolutePath,
+                        extension.reportDir.absolutePath
+                ]
+                inputs.dir(extension.dataDir)
+                outputs.dir(extension.reportDir)
             }
+
         }
     }
 
-    String dataDirName = 'scoverage'
 }
diff --git a/src/main/groovy/org/scoverage/ScoveragePlugin.groovy b/src/main/groovy/org/scoverage/ScoveragePlugin.groovy
index 75753d3..4f43b0e 100644
--- a/src/main/groovy/org/scoverage/ScoveragePlugin.groovy
+++ b/src/main/groovy/org/scoverage/ScoveragePlugin.groovy
@@ -7,6 +7,7 @@ class ScoveragePlugin implements Plugin<Project> {
     static String CONFIGURATION_NAME = 'scoverage'
 
     static String TEST_NAME = 'testScoverage'
+    static String REPORT_NAME = 'reportScoverage'
     static String CHECK_NAME = 'checkScoverage'
     static String COMPILE_NAME = 'compileScoverageScala'
 
@@ -16,4 +17,8 @@ class ScoveragePlugin implements Plugin<Project> {
             t.extensions.create(CONFIGURATION_NAME, ScoverageExtension, t)
         }
     }
+
+    protected static ScoverageExtension extensionIn(Project project) {
+        project.extensions[CONFIGURATION_NAME]
+    }
 }
diff --git a/src/main/groovy/org/scoverage/ScoverageReport.java b/src/main/groovy/org/scoverage/ScoverageReport.java
new file mode 100644
index 0000000..06776b7
--- /dev/null
+++ b/src/main/groovy/org/scoverage/ScoverageReport.java
@@ -0,0 +1,36 @@
+package org.scoverage;
+
+import scala.collection.Seq;
+import scala.collection.Set;
+import scoverage.Coverage;
+import scoverage.IOUtils;
+import scoverage.report.CoberturaXmlWriter;
+import scoverage.report.ScoverageHtmlWriter;
+
+import java.io.File;
+import java.util.Arrays;
+
+/**
+ * late binding of scoverage core libraries (without a dependency on groovy)
+ */
+public class ScoverageReport {
+
+    public static void main(String... args) {
+        File sourceDir = new File(args[0]);
+        File dataDir = new File(args[1]);
+        File reportDir = new File(args[2]);
+
+        File coverageFile = IOUtils.coverageFile(dataDir);
+        File[] array = IOUtils.findMeasurementFiles(dataDir);
+        // TODO: patch scoverage core to use a consistent collection type?
+        Seq<File> measurementFiles = scala.collection.JavaConversions.asScalaBuffer(Arrays.asList(array));
+
+        Coverage coverage = IOUtils.deserialize(coverageFile);
+
+        Set<Object> measurements = IOUtils.invoked(measurementFiles);
+        coverage.apply(measurements);
+
+        new ScoverageHtmlWriter(sourceDir, reportDir).write(coverage);
+        new CoberturaXmlWriter(sourceDir, reportDir).write(coverage);
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/META-INF/gradle-plugins/scct.properties b/src/main/resources/META-INF/gradle-plugins/scct.properties
deleted file mode 100644
index 623a210..0000000
--- a/src/main/resources/META-INF/gradle-plugins/scct.properties
+++ /dev/null
@@ -1 +0,0 @@
-implementation-class=scoverage.ScoveragePlugin
diff --git a/src/main/resources/META-INF/gradle-plugins/scoverage.properties b/src/main/resources/META-INF/gradle-plugins/scoverage.properties
new file mode 100644
index 0000000..4490e61
--- /dev/null
+++ b/src/main/resources/META-INF/gradle-plugins/scoverage.properties
@@ -0,0 +1 @@
+implementation-class=org.scoverage.ScoveragePlugin