diff --git a/package-lock.json b/package-lock.json
index 928bbaa..3c046e3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,6 +14,55 @@
         "nan": "^2.9.2"
       }
     },
+    "@gitzone/tsbuild": {
+      "version": "2.0.22",
+      "resolved": "https://registry.npmjs.org/@gitzone/tsbuild/-/tsbuild-2.0.22.tgz",
+      "integrity": "sha512-H0rqGVUKXWgxXhkY62kF92WpbS9GSJW27jQXaoyMsQptTQN4HIYKHWZMdO4egkk0/gDmKnBjk8MXg5Rx6efItA==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/smartfile": "^6.0.6",
+        "@pushrocks/smartlog": "^2.0.1",
+        "@pushrocks/smartpath": "^4.0.1",
+        "@pushrocks/smartpromise": "^2.0.5",
+        "typescript": "^3.0.1"
+      },
+      "dependencies": {
+        "@pushrocks/smartfile": {
+          "version": "6.0.6",
+          "resolved": "https://registry.npmjs.org/@pushrocks/smartfile/-/smartfile-6.0.6.tgz",
+          "integrity": "sha512-vA1+yS6n0kuBZ+Bl30rxOCYvgIj0mo9g303cUpOZR0I781iQVWHcBKRC05FaGDxJD1HuYdvbSK+7vlrzZjVcMw==",
+          "dev": true,
+          "requires": {
+            "@pushrocks/smartpath": "^4.0.1",
+            "@pushrocks/smartpromise": "^2.0.5",
+            "@pushrocks/smartrequest": "^1.1.12",
+            "@types/fs-extra": "^5.0.4",
+            "@types/vinyl": "^2.0.2",
+            "fs-extra": "^7.0.0",
+            "glob": "^7.1.2",
+            "js-yaml": "^3.10.0",
+            "vinyl-file": "^3.0.0"
+          }
+        },
+        "fs-extra": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz",
+          "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "typescript": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
+          "integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
+          "dev": true
+        }
+      }
+    },
     "@gitzone/tsrun": {
       "version": "1.1.9",
       "resolved": "https://registry.npmjs.org/@gitzone/tsrun/-/tsrun-1.1.9.tgz",
@@ -101,6 +150,12 @@
       "resolved": "https://registry.npmjs.org/@pushrocks/smartlog-interfaces/-/smartlog-interfaces-1.0.9.tgz",
       "integrity": "sha512-0qwpomrRN0kFjmhR9m1iHYXoISoNuXtRP0Wr+JtkYyURLwKHMaW8Xoznf8MzXJptRfqufJi3Fxh5HodpPrIZUA=="
     },
+    "@pushrocks/smartpath": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartpath/-/smartpath-4.0.1.tgz",
+      "integrity": "sha512-MaI0+uLQPCr2V3WGnbdgb0pWa9xkWyrP4qYcbsHIjeismGLbn9s3jmP/HIXU8LkgzRgaVb+BJxmZJHOwl32DyA==",
+      "dev": true
+    },
     "@pushrocks/smartpromise": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@pushrocks/smartpromise/-/smartpromise-2.0.5.tgz",
diff --git a/package.json b/package.json
index 338563c..d88f776 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,8 @@
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "tstest test/",
-    "build": "echo \"Not needed for now\""
+    "test": "(tstest test/)",
+    "build": "(tsbuild)"
   },
   "repository": {
     "type": "git",
@@ -36,6 +36,7 @@
     "rxjs": "^6.2.2"
   },
   "devDependencies": {
+    "@gitzone/tsbuild": "^2.0.22",
     "@gitzone/tstest": "^1.0.11",
     "@pushrocks/tapbundle": "^3.0.1",
     "@types/node": "^10.5.6"