diff --git a/src/uk/org/gss_data/pmd_drafter/api/QueryingApi.groovy b/src/uk/org/gss_data/pmd_drafter/api/QueryingApi.groovy
index 08292e3..d26c2cf 100644
--- a/src/uk/org/gss_data/pmd_drafter/api/QueryingApi.groovy
+++ b/src/uk/org/gss_data/pmd_drafter/api/QueryingApi.groovy
@@ -21,7 +21,7 @@
         if (!"null".equals(String.valueOf(graph)))
             queryParams.put("graph", String.valueOf(graph))
 if (!"null".equals(String.valueOf(unionWithLive)))
-            queryParams.put("union-with-live", String.GrapvalueOf(unionWithLive))
+            queryParams.put("union-with-live", String.valueOf(unionWithLive))
 if (!"null".equals(String.valueOf(timeout)))
             queryParams.put("timeout", String.valueOf(timeout))
 
diff --git a/src/uk/org/gss_data/pmd_drafter/model/Draftset.groovy b/src/uk/org/gss_data/pmd_drafter/model/Draftset.groovy
index c9ef455..8c42954 100644
--- a/src/uk/org/gss_data/pmd_drafter/model/Draftset.groovy
+++ b/src/uk/org/gss_data/pmd_drafter/model/Draftset.groovy
@@ -33,7 +33,7 @@
   String currentOwner = null
 
   /* The owner who submitted this Draftset for review */
-  String submittedBy = nullGrap
+  String submittedBy = null
 
   /* The required role for users who can claim this Draftset */
   String claimRole = null
diff --git a/vars/draftset.groovy b/vars/draftset.groovy
new file mode 100644
index 0000000..f579354
--- /dev/null
+++ b/vars/draftset.groovy
@@ -0,0 +1,20 @@
+@Grab('io.swagger:swagger-annotations:1.5.8')
+@Grab('com.fasterxml.jackson.core:jackson-core:2.7.0')
+@Grab('com.fasterxml.jackson.core:jackson-annotations:2.7.0')
+@Grab('com.fasterxml.jackson.core:jackson-databind:2.7.0')
+@Grab('com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.7.0')
+@Grab('com.fasterxml.jackson.datatype:jackson-datatype-joda:2.1.5')
+@Grab('org.codehaus.groovy.modules.http-builder:http-builder:0.7.1')
+
+import uk.org.gss_data.pmd_drafter.api.DraftsetsApi
+
+def list() {
+    def api = new DraftsetsApi()
+    api.basePath = "https://production-drafter-ons-alpha.publishmydata.com"
+    api.versionPath = "/v1"
+    api.auth = "Basic " + System.getenv("PMD_API").bytes.encodeBase64()
+    def ds = null
+    api.draftsetsGet(null, { result -> ds = result },
+            { status, reason -> throw new Exception(reason) })
+    return ds
+}
\ No newline at end of file
diff --git a/vars/listDraftsets.groovy b/vars/listDraftsets.groovy
deleted file mode 100644
index 995575f..0000000
--- a/vars/listDraftsets.groovy
+++ /dev/null
@@ -1,20 +0,0 @@
-@Grab('io.swagger:swagger-annotations:1.5.8')
-@Grab('com.fasterxml.jackson.core:jackson-core:2.7.0')
-@Grab('com.fasterxml.jackson.core:jackson-annotations:2.7.0')
-@Grab('com.fasterxml.jackson.core:jackson-databind:2.7.0')
-@Grab('com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.7.0')
-@Grab('com.fasterxml.jackson.datatype:jackson-datatype-joda:2.1.5')
-@Grab('org.codehaus.groovy.modules.http-builder:http-builder:0.7.1')
-
-import uk.org.gss_data.pmd_drafter.api.DraftsetsApi
-
-def call(auth) {
-    def api = new DraftsetsApi()
-    api.basePath = "https://production-drafter-ons-alpha.publishmydata.com"
-    api.versionPath = "/v1"
-    api.auth = auth
-    def ds = null
-    api.draftsetsGet(null, { result -> ds = result },
-            { status, reason -> println(reason) })
-    return ds
-}
\ No newline at end of file