diff --git a/.gitignore b/.gitignore
index da5d3c0e..ff79a025 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,10 @@ rooibosDist.brs
 yarn.lock
 yarn-error.log
 /outRun/
+node_modules/
+out
+**/roku_modules/
+package-lock.json
+
+!.vscode
+.vscode/.env
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..bb972c03
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,42 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "bashdb",
+      "request": "launch",
+      "name": "Build",
+      "cwd": "${workspaceFolder}",
+      "program": "npm run build",
+      "args": []
+    },
+    {
+      "type": "brightscript",
+      "request": "launch",
+      "name": "TEST",
+      "internalConsoleOptions": "neverOpen",
+      "envFile": "${workspaceFolder}/devstuff/.env",
+      "preLaunchTask": "buildTests",
+      "host": "${env:ROKU_DEV_TARGET}",
+      "password": "${env:ROKU_DEVPASSWORD}",
+      "rootDir": "${workspaceFolder}/build",
+      // "debugServer": 4711,
+      "sourceDirs": [
+        "${workspaceFolder}/frameworkTests"
+      ],
+      "files": [
+        "*",
+        "*.*",
+        "**/*.*",
+        "!*.zip"
+      ],
+      "consoleOutput": "normal",
+      "stopOnEntry": false,
+      "retainDeploymentArchive": true,
+      "retainStagingFolder": true,
+      "stopDebuggerOnAppExit": true
+    },
+  ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..e8f8a900
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,16 @@
+{
+  "cSpell.words": [
+    "Roadmap",
+    "brightscript",
+    "rooibos"
+  ],
+  "jira-plugin.workingProject": "",
+  "workbench.colorCustomizations": {
+    "statusBar.background": "#551A8B",
+    "statusBar.debuggingBackground": "#551A8B",
+    "panelTitle.activeBorder": "#ff0000",
+    "activityBar.background": "#0E3047",
+    "titleBar.activeBackground": "#134464",
+    "titleBar.activeForeground": "#F6FAFD"
+  }
+}
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 00000000..7cb427a3
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,32 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "brightscript",
+      "request": "launch",
+      "name": "Tests",
+      "stopOnEntry": false,
+      "preLaunchTask": "buildTests",
+      "envFile": "${workspaceFolder}/.vscode/.env",
+      "host": "${env:ROKU_DEV_TARGET}",
+      "password": "${env:ROKU_DEVPASSWORD}",
+      "rootDir": "${workspaceFolder}/tests/dist",
+      "sourceDirs": [
+        "${workspaceFolder}/src",
+        "${workspaceFolder}/tests/src"
+      ],
+      "files": [
+        "manifest",
+        "source/**/*.*",
+        "components/**/*.*",
+        "images/**/*.*",
+        "font/**/*.*",
+        "!*.zip",
+        "!**/*.zip"
+      ],
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ROADMAP.md b/ROADMAP.md
deleted file mode 100644
index 8f3dd8f3..00000000
--- a/ROADMAP.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Rooibos Roadmap
-
-## ShortTerm
-
-### Unit tests for the framework and general framework improvements
-
-Unit tests will be written which test the following:
-
- - Assertions
- - Ignore
- - Only
- - Mocks
- - Stubs
- - Expect
-
-# MidTerm
-
-### Add additional reporting options
-
-Will add the ability to specify a unit test reporting class, to facilitate custom unit test reporting
-
-# LongTerm
-
-### Integrate with vscode ide
-
-Support test execution from and output to Visual Studio Code ide, as per mocha test runner extension
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 276cbf9e..00000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-2.3.0
diff --git a/app.mk b/app.mk
deleted file mode 100755
index 9f24a294..00000000
--- a/app.mk
+++ /dev/null
@@ -1,237 +0,0 @@
-#########################################################################
-# common include file for application Makefiles
-#
-# Makefile Common Usage:
-# > make
-# > make install
-# > make remove
-#
-# Makefile Less Common Usage:
-# > make art-opt
-# > make pkg
-# > make install_native
-# > make remove_native
-# > make tr
-#
-# By default, ZIP_EXCLUDE will exclude -x \*.pkg -x storeassets\* -x keys\* -x .\*
-# If you define ZIP_EXCLUDE in your Makefile, it will override the default setting.
-#
-# To exclude different files from being added to the zipfile during packaging
-# include a line like this:ZIP_EXCLUDE= -x keys\*
-# that will exclude any file who's name begins with 'keys'
-# to exclude using more than one pattern use additional '-x <pattern>' arguments
-# ZIP_EXCLUDE= -x \*.pkg -x storeassets\*
-#
-# Important Notes: 
-# To use the "install" and "remove" targets to install your
-# application directly from the shell, you must do the following:
-#
-# 1) Make sure that you have the curl command line executable in your path
-# 2) Set the variable ROKU_DEV_TARGET in your environment to the IP 
-#    address of your Roku box. (e.g. export ROKU_DEV_TARGET=192.168.1.1.
-#    Set in your this variable in your shell startup (e.g. .bashrc)
-##########################################################################  
-DISTREL = ../dist
-COMMONREL ?= ../common
-SOURCEREL = .
-
-ZIPREL = $(DISTREL)/apps
-PKGREL = $(DISTREL)/packages
-
-APPSOURCEDIR = source
-IMPORTFILES = $(foreach f,$(IMPORTS),$(COMMONREL)/$f.brs)
-IMPORTCLEANUP = $(foreach f,$(IMPORTS),$(APPSOURCEDIR)/$f.brs)
-
-NATIVEDEVREL  = $(DISTREL)/rootfs/Linux86_dev.OBJ/root/nvram/incoming
-NATIVEDEVPKG  = $(NATIVEDEVREL)/dev.zip
-NATIVETICKLER = $(DISTREL)/application/Linux86_dev.OBJ/root/bin/plethora  tickle-plugin-installer
-
-APPGENKEY = ./GENKEY
-APPDEVID = $(shell grep DevID $(APPGENKEY) | sed "s/DevID: //")
-GITCOMMIT = $(shell git rev-parse --short HEAD)
-BUILDDATE = $(shell date -u | awk '{ print $$2,$$3,$$6,$$4 }')
-
-ifdef DEVPASSWORD
-    USERPASS = rokudev:$(DEVPASSWORD)
-else
-    USERPASS = rokudev
-endif
-
-ifndef ZIP_EXCLUDE
-  ZIP_EXCLUDE= -x \*.pkg -x storeassets\* -x keys\* -x \*/.\*
-endif
-
-HTTPSTATUS = $(shell curl --silent --write-out "\n%{http_code}\n" $(ROKU_DEV_TARGET))
-
-ifeq "$(HTTPSTATUS)" " 401"
-	CURLCMD = curl -S --connect-timeout 2 --max-time 30 --retry 5
-else
-	CURLCMD = curl -S --connect-timeout 2 --max-time 30 --retry 5 --user $(USERPASS) --digest 
-endif
-
-.PHONY: all $(APPNAME) verify-keys home
-
-home:
-	@echo "Forcing roku to main menu screen $(ROKU_DEV_TARGET)..."
-	curl -s -S -d '' http://$(ROKU_DEV_TARGET):8060/keypress/home
-	sleep 2
-
-$(APPNAME): manifest
-	@echo "*** Creating $(APPNAME).zip ***"
-
-	@echo "  >> removing old application zip $(ZIPREL)/$(APPNAME).zip"
-	@if [ -e "$(ZIPREL)/$(APPNAME).zip" ]; \
-	then \
-		rm  $(ZIPREL)/$(APPNAME).zip; \
-	fi
-
-	@echo "  >> creating destination directory $(ZIPREL)"	
-	@if [ ! -d $(ZIPREL) ]; \
-	then \
-		mkdir -p $(ZIPREL); \
-	fi
-
-	@echo "  >> setting directory permissions for $(ZIPREL)"
-	@if [ ! -w $(ZIPREL) ]; \
-	then \
-		chmod 755 $(ZIPREL); \
-	fi
-
-	@echo "  >> copying imports"
-	@if [ "$(IMPORTFILES)" ]; \
-	then \
-		mkdir $(APPSOURCEDIR)/common; \
-		cp -f -p -v $(IMPORTFILES) $(APPSOURCEDIR)/common/; \
-	fi \
-
-	@echo "  >> generating build info file"
-	@if [ -e "$(APPSOURCEDIR)/buildinfo.brs" ]; \
-	then \
-		rm  $(APPSOURCEDIR)/buildinfo.brs; \
-	fi
-	echo "Function BuildDate()" >> $(APPSOURCEDIR)/buildinfo.brs
-	echo "  return \"${BUILDDATE}\"" >> $(APPSOURCEDIR)/buildinfo.brs
-	echo "End Function" >> $(APPSOURCEDIR)/buildinfo.brs
-	echo "Function BuildCommit()" >> $(APPSOURCEDIR)/buildinfo.brs
-	echo "  return \"${GITCOMMIT}\"" >> $(APPSOURCEDIR)/buildinfo.brs
-	echo "End Function" >> $(APPSOURCEDIR)/buildinfo.brs
-
-# zip .png files without compression
-# do not zip up Makefiles, or any files ending with '~'
-	@echo "  >> creating application zip $(ZIPREL)/$(APPNAME).zip"	
-	@if [ -d $(SOURCEREL) ]; \
-	then \
-		(zip -0 -r "$(ZIPREL)/$(APPNAME).zip" . -i \*.png $(ZIP_EXCLUDE)); \
-		(zip -9 -r "$(ZIPREL)/$(APPNAME).zip" . -x \*~ -x \*.png -x Makefile $(ZIP_EXCLUDE)); \
-	else \
-		echo "Source for $(APPNAME) not found at $(SOURCEREL)"; \
-	fi
-
-	@if [ "$(IMPORTCLEANUP)" ]; \
-	then \
-		echo "  >> deleting imports";\
-		rm -r -f $(APPSOURCEDIR)/common; \
-	fi \
-
-	@echo "*** packaging $(APPNAME) complete ***"
-
-install: $(APPNAME) home
-	@echo "Installing $(APPNAME) to host $(ROKU_DEV_TARGET)"
-	@$(CURLCMD) --user $(USERPASS) --digest -F "mysubmit=Install" -F "archive=@$(ZIPREL)/$(APPNAME).zip" -F "passwd=" http://$(ROKU_DEV_TARGET)/plugin_install | grep "<font color" | sed "s/<font color=\"red\">//" | sed "s[</font>[["
-
-# Make certain that the Roku is packaging with the correct key/DevID
-verify-keys: $(APPGENKEY)
-	@echo "Verifying developer key is $(APPDEVID)"
-	@if [ "$(HTTPSTATUS)" == " 401" ]; \
-  then \
-		ROKU_DEV_ID=`$(CURLCMD) --user $(USERPASS) --digest http://$(ROKU_DEV_TARGET)/plugin_package | grep $(APPDEVID)`; \
-		if [ "$$ROKU_DEV_IDx" == "x" ]; then echo "ROKU_DEV_ID doesn't match $(APPDEVID)"; exit 1; fi \
-	else \
-		ROKU_DEV_ID=`$(CURLCMD) http://$(ROKU_DEV_TARGET)/plugin_package | grep $(APPDEVID)`; \
-		if [ "$$ROKU_DEV_IDx" == "x" ]; then echo "ROKU_DEV_ID doesn't match $(APPDEVID)"; exit 1; fi \
-	fi
-
-pkg: install verify-keys
-	@echo "*** Creating Package ***"
-
-	@echo "  >> creating destination directory $(PKGREL)"	
-	@if [ ! -d $(PKGREL) ]; \
-	then \
-		mkdir -p $(PKGREL); \
-	fi
-
-	@echo "  >> setting directory permissions for $(PKGREL)"
-	@if [ ! -w $(PKGREL) ]; \
-	then \
-		chmod 755 $(PKGREL); \
-	fi
-
-	@echo "Packaging  $(APPSRC)/$(APPNAME) on host $(ROKU_DEV_TARGET)"
-	@if [ "$(HTTPSTATUS)" == " 401" ]; \
-	then \
-		read -p "Password: " REPLY ; echo $$REPLY | xargs -I{} $(CURLCMD) --user $(USERPASS) --digest -Fmysubmit=Package -Fapp_name=$(APPNAME)/$(VERSION) -Fpasswd={} -Fpkg_time=`expr \`date +%s\` \* 1000` "http://$(ROKU_DEV_TARGET)/plugin_package" | grep '^<tr><td><font face="Courier"><a' | sed 's/.*href=\"\([^\"]*\)\".*/\1/' | sed 's#pkgs//##' | xargs -I{} $(CURLCMD) --user $(USERPASS) --digest -o $(PKGREL)/$(APPNAME)_$(APPDEVID)_`date +%F-%T`.pkg http://$(ROKU_DEV_TARGET)/pkgs/{} ; \
-	else \
-		read -p "Password: " REPLY ; echo $$REPLY | xargs -I{} $(CURLCMD) -Fmysubmit=Package -Fapp_name=$(APPNAME)/$(VERSION) -Fpasswd={} -Fpkg_time=`expr \`date +%s\` \* 1000` "http://$(ROKU_DEV_TARGET)/plugin_package" | grep '^<tr><td><font face="Courier"><a' | sed 's/.*href=\"\([^\"]*\)\".*/\1/' | sed 's#pkgs//##' | xargs -I{} $(CURLCMD) -o $(PKGREL)/$(APPNAME)_$(APPDEVID)_`date +%F-%T`.pkg http://$(ROKU_DEV_TARGET)/pkgs/{} ; \
-	fi
-
-	@echo "*** Package  $(APPNAME) complete ***" 
-
-remove:
-	@echo "Removing $(APPNAME) from host $(ROKU_DEV_TARGET)"
-	@if [ "$(HTTPSTATUS)" == " 401" ]; \
-	then \
-		$(CURLCMD) --user $(USERPASS) --digest -F "mysubmit=Delete" -F "archive=" -F "passwd=" http://$(ROKU_DEV_TARGET)/plugin_install | grep "<font color" | sed "s/<font color=\"red\">//" | sed "s[</font>[[" ; \
-	else \
-		curl -s -S -F "mysubmit=Delete" -F "archive=" -F "passwd=" http://$(ROKU_DEV_TARGET)/plugin_install | grep "<font color" | sed "s/<font color=\"red\">//" | sed "s[</font>[[" ; \
-	fi
-
-install_native: $(APPNAME)
-	@echo "Installing $(APPNAME) to native."
-	@mkdir -p $(NATIVEDEVREL)
-	@cp $(ZIPREL)/$(APPNAME).zip  $(NATIVEDEVPKG)
-	@$(NATIVETICKLER)
-
-remove_native:
-	@echo "Removing $(APPNAME) from native."
-	@rm $(NATIVEDEVPKG)
-	@$(NATIVETICKLER)
-
-APPS_JPG_ART=`\find . -name "*.jpg"`
-
-art-jpg-opt:
-	p4 edit $(APPS_JPG_ART)
-	for i in $(APPS_JPG_ART); \
-	do \
-		TMPJ=`mktemp` || return 1; \
-		echo "optimizing $$i"; \
-		(jpegtran -copy none -optimize -outfile $$TMPJ $$i && mv -f $$TMPJ $$i &); \
-	done
-	wait
-	p4 revert -a $(APPS_JPG_ART)
-
-APPS_PNG_ART=`\find . -name "*.png"`
-
-art-png-opt:
-	p4 edit $(APPS_PNG_ART)
-	for i in $(APPS_PNG_ART); \
-	do \
-		(optipng -o7 $$i &); \
-	done
-	wait
-	p4 revert -a $(APPS_PNG_ART)
-
-art-opt: art-png-opt art-jpg-opt
-
-tr:
-	p4 edit locale/.../translations.xml
-	../../rdk/rokudev/utilities/linux/bin/maketr
-	rm locale/en_US/translations.xml
-	p4 revert -a locale/.../translations.xml
-
-screenshot:
-	SCREENSHOT_TIME=`date "+%s"`; \
-	curl -m 1 -o screenshot.jpg --user $(USERPASS) --digest "http://$(ROKU_DEV_TARGET)/pkgs/dev.jpg?time=$$SCREENSHOT_TIME" -H 'Accept: image/png,image/*;q=0.8,*/*;q=0.5' -H 'Accept-Language: en-US,en;q=0.5' -H 'Accept-Encoding: gzip, deflate'
-
-
-
-
diff --git a/bsconfig.json b/bsconfig.json
index df7b9795..13189ef4 100644
--- a/bsconfig.json
+++ b/bsconfig.json
@@ -1,15 +1,20 @@
-//framework tests
 {
-    "rootDir": "frameworkTests",
-    "autoImportComponentScript": false
-}
-// framework
-// {
-//   "rootDir": "src",
-//   "files": [
-//     {
-//       "src": "**/*.*",
-//       "dest": "source"
-//     }
-//   ]
-// }
\ No newline at end of file
+  "rootDir": "src",
+  "files": [
+    "manifest",
+    "source/**/*.*",
+    "components/**/*.*"
+  ],
+  "autoImportComponentScript": true,
+  "createPackage": false,
+  "stagingFolderPath": "dist",
+  "diagnosticFilters": [
+    {
+      "src": "**/roku_modules/**/*.*",
+      "codes": [
+        1107,
+        1009
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/devScripts/buildTests.sh b/devScripts/buildTests.sh
deleted file mode 100755
index 7abd9fdd..00000000
--- a/devScripts/buildTests.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-# note - I use these scripts, as I can't stop vscode ides gulp runner from changing the debug console window, which is annoying.
-
-parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
-cd "$parent_path"/..
-
-gulp prePublishFrameworkTests
diff --git a/frameworkTests/components/tests/NodeExampleTests.bs b/frameworkTests/components/tests/NodeExampleTests.bs
deleted file mode 100644
index 87451f75..00000000
--- a/frameworkTests/components/tests/NodeExampleTests.bs
+++ /dev/null
@@ -1,2 +0,0 @@
-import "pkg:/source/tests/rooibosFunctionMap.brs"
-import "pkg:/source/tests/rooibosDist.brs"
\ No newline at end of file
diff --git a/frameworkTests/manifest b/frameworkTests/manifest
deleted file mode 100644
index 9a12c564..00000000
--- a/frameworkTests/manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-title=Rooibos
-major_version=0
-minor_version=2
-build_version=0
diff --git a/frameworkTests/source/main.bs b/frameworkTests/source/main.bs
deleted file mode 100644
index 142f0376..00000000
--- a/frameworkTests/source/main.bs
+++ /dev/null
@@ -1,58 +0,0 @@
-sub main(args as dynamic)
-    'bs:disable-next-line
-    if (type(Rooibos_init) = "Function") then Rooibos_init(setupGlobals, "AddTestUtils", invalid, m)
-
-    InitScreen()
-end sub
-
-function initScreen() as void
-    'this will be where you setup your typical roku app
-    'it will not be launched when running unit tests
-    screen = CreateObject("roSGScreen")
-    m.port = CreateObject("roMessagePort")
-    screen.setMessagePort(m.port)
-    
-    rootScene = screen.CreateScene("TestsScene")
-    rootScene.id = "ROOT"
-    
-    screen.show()
-
-    SetupGlobals(screen)
-    
-    while(true)
-        msg = wait(0, m.port)
-        msgType = type(msg)
-      
-        if msgType = "roSGScreenEvent"
-            if msg.isScreenClosed() 
-                return
-            end if
-        end if
-    end while
-end function
-
-
-'*************************************************************
-'** SetupGlobals
-'** @param screen as roScreen - screen to set globals on
-'*************************************************************
-function setupGlobals(screen) as void
-    ? "SETTTING UP GLOBALS - do your standard setup stuff here"
-
-    m.global = screen.getGlobalNode()
-
-    m.roDeviceInfo = CreateObject("roDeviceInfo")
-    
-    m.displayInfo = {
-        resolution: m.roDeviceInfo.GetUIResolution() 
-        displayType: m.roDeviceInfo.GetDisplayType() 
-        width: m.roDeviceInfo.GetDisplaySize().w
-        height: m.roDeviceInfo.GetDisplaySize().h
-        wFactor: m.roDeviceInfo.GetDisplaySize().w/1920
-        hFactor: m.roDeviceInfo.GetDisplaySize().h/1080
-    }
-
-    m.modelLocator = {"displayInfo":m.displayInfo} ' contrived example : this would be a specifc modelLocator node/other setup thing
-
-    m.global.addFields({"modelLocator": m.modelLocator})
-end function
diff --git a/frameworkTests/source/tests/AssertionTests.bs b/frameworkTests/source/tests/AssertionTests.bs
deleted file mode 100644
index 5186e6c9..00000000
--- a/frameworkTests/source/tests/AssertionTests.bs
+++ /dev/null
@@ -1,637 +0,0 @@
-'@TestSuite [RBSA] Rooibos assertion tests
-
-namespace Rooibos.Tests.Assertions
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests basic assertions
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test Fail
-function fail() as void
-
-  assertResult = m.Fail("reason")
-
-  isFail = m.currentResult.isFail
-  m.currentResult.Reset()
-
-  m.assertFalse(assertResult)
-  m.assertTrue(isFail)
-end function
-
-'@Test AssertTrue
-'@Params[true, true]
-'@Params[false, false]
-'@Params[invalid, false]
-'@Params[0, false]
-'@Params[1, false]
-'@Params["test", false]
-function assertTrue(value, expectedAssertResult) as void
-
-  assertResult = m.assertTrue(value)
-  isFail = m.currentResult.isFail
-  m.currentResult.Reset()
-
-  m.assertEqual(assertResult, expectedAssertResult)
-  m.assertEqual(isFail, not expectedAssertResult)
-end function
-
-'@Test AssertFalse
-'@Params[false, true]
-'@Params[true, false]
-'@Params[invalid, false]
-'@Params[0, false]
-'@Params[1, false]
-'@Params["test", false]
-function assertFalse(value, expectedAssertResult) as void
-
-  assertResult = m.assertFalse(value)
-
-  isFail = m.currentResult.isFail
-  m.currentResult.Reset()
-
-  m.assertEqual(assertResult, expectedAssertResult)
-  m.assertEqual(isFail, not expectedAssertResult)
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests AssertArrayContainsAAs
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test Fail
-'@Params[[{"one":1}], [{"one":2}]]
-'@Params[[{"one":1}], [{"one":"a"}]]
-'@Params[[{"one":1}], [{}]]
-'@Params[[{"one":1}], [invalid]]
-'@Params[[{"one":1}], []]
-'@Params[[{"one":1}], invalid]
-'@Params[[{"one":1}], [[]] ]
-'@Params[[{"one":1}], ["wrong"] ]
-'@Params[[{"one":1}], [2] ]
-'@Params[[{"one":"a"}], [{"one":1}] ]
-'@Params[[{"two":1}], [{"one":1}] ]
-'@Params[[invalid], [{"one":1}] ]
-'@Params[invalid, [{"one":1}] ]
-'@Params[[{"one":1, "two":2}], [{"one":"1"}] ]
-'@Params[[{"one":1}, {"two":2}], [{"one":"1"}, {"two":"a"}] ]
-'@Params[[{"one":1}, {"two":2}], [{"a":1}, {"a":1}, {"a":1}] ]
-function assertArrayContainsAAs_Fail(expectedAAs, items) as void
-
-  assertResult = m.assertArrayContainsAAs(items, expectedAAs)
-
-  isFail = m.currentResult.isFail
-  m.currentResult.Reset()
-
-  m.assertFalse(assertResult)
-  m.assertTrue(isFail)
-end function
-
-
-'@Test pass
-'@Params[[], []]
-'@Params[[{}], [{}]]
-'@Params[[{"one":1}], [{"one":1}]]
-'@Params[[{"one":1, "two":2}], [{"one":1, "two":2}]]
-'@Params[[{"one":1, "two":2}], [{ "two":2, "one":1}]]
-'@Params[[{"one":1, "two":2}, {"one":1}], [{"one":1}, { "two":2, "one":1}]]
-'@Params[[{"one":1, "two":2}, {"one":1}, {"three":3}], [{"one":1}, {"three":3}, { "two":2, "one":1}]]
-function assertArrayContainsAAs_Pass(expectedAAs, items) as void
-
-  assertResult = m.assertArrayContainsAAs(items, expectedAAs)
-
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.assertTrue(assertResult)
-  m.assertFalse(isFail)
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests global is present on testSuite
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@BeforeEach
-function assertGlobal_beforeEach() as void
-  m.beforeEachGlobal = m.global
-end function
-
-'@AfterEach
-function assertGlobal_afterEach() as void
-  m.afterEachGlobal = m.global
-end function
-
-'@Test global is in test
-function assertGlobalIsPassedIntoTest() as void
-  m.assertNotInvalid(m.global)
-end function
-
-'@Test global is in before each and after each
-function assertGlobalIsPassedInto_beforeEach_and_afterEach() as void
-  m.assertNotInvalid(m.global)
-  m.assertNotInvalid(m.beforeEachGlobal)
-  m.assertNotInvalid(m.afterEachGlobal)
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests AssertArrayContainsOnlyValuesOfType
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test pass
-'@Params[["one", "two", "three"], "String"]
-'@Params[[1, 2, 3], "Integer"]
-'@Params[[true, true, false], "Boolean"]
-'@Params[[[true, true], [false, false]], "Array"]
-'@Params[[{"test":1}, {"test":1}], "AssociativeArray"]
-function assertArrayContainsOnlyValuesOfType_Pass(values, typeName) as void
-
-  assertResult = m.assertArrayContainsOnlyValuesOfType(values, typeName)
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.assertTrue(assertResult)
-  m.assertFalse(isFail)
-
-end function
-
-'@Test fail
-'@Params[["one", 2, "three"], "String"]
-'@Params[[1, "two", 3], "Integer"]
-'@Params[[true, "true", false], "Boolean"]
-'@Params[[[true, true], false, false], "Array"]
-'@Params[[{"test":1}, "notAA"], "AssociativeArray"]
-'@Params[["one", "two", "three"], "UnknownType"]
-'@Params[["one", "two", "three"], "Integer"]
-'@Params[[1, 2, 3], "String"]
-'@Params[[true, true, false], "String"]
-'@Params[[[true, true], [false, false]], "AssociativeArray"]
-'@Params[[{"test":1}, {"test":1}], "Array"]
-function assertArrayContainsOnlyValuesOfType_Fail(values, typeName) as void
-
-  assertResult = m.assertArrayContainsOnlyValuesOfType(values, typeName)
-  isFail = m.currentResult.isFail
-
-  isFail = m.currentResult.isFail
-  m.currentResult.Reset()
-
-  m.assertFalse(assertResult)
-  m.assertTrue(isFail)
-
-
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests white spaces work with annotations
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'some comments to
-'demonstrate
-'@Test comments between tests
-'that we can have comments
-'between functions and tags
-function whiteSpacing() as void
-  m.assertTrue(true)
-end function
-
-'some comments to
-'demonstrate
-'@Test comments between tests with params
-'@Params[1]
-
-'@Params[2]
-'that we can have comments
-'@Params[3]
-'between functions and tags
-'@Params[4]
-
-function whiteSpacing_params(value) as void
-  m.assertTrue(true)
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests AssertNotEmpty
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test pass
-'@Params[["one", "two", "three"]]
-'@Params[[1, 2, 3]]
-'@Params[[true]]
-'@Params[[[true, true], [false, false]]]
-'@Params[[{"test":1}]]
-'@Params["not empty"]
-'@Params[[invalid]]
-function assertNotEmpty_Pass(values) as void
-
-  assertResult = m.assertNotEmpty(values)
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.assertTrue(assertResult)
-  m.assertFalse(isFail)
-
-end function
-
-'@Test fail
-'@Params[invalid]
-'@Params[[]]
-'@Params[{}]
-'@Params[1]
-'@Params[""]
-function assertNotEmpty_Fail(values) as void
-
-  assertResult = m.assertNotEmpty(values)
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.assertFalse(assertResult)
-  m.assertTrue(isFail)
-
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests AssertEmpty
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test pass
-'@Params[[]]
-'@Params[{}]
-'@Params[""]
-function assertEmpty_Pass(values) as void
-
-  assertResult = m.assertEmpty(values)
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.assertTrue(assertResult)
-  m.assertFalse(isFail)
-
-end function
-
-'@Test fail
-'@Params[1]
-'@Params[invalid]
-'@Params[["one", "two", "three"]]
-'@Params[[1, 2, 3]]
-'@Params[[true]]
-'@Params[[[true, true], [false, false]]]
-'@Params[[{"test":1}]]
-'@Params["not empty"]
-'@Params[[invalid]]
-function assertEmpty_Fail(values) as void
-
-  assertResult = m.assertEmpty(values)
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.assertFalse(assertResult)
-  m.assertTrue(isFail)
-
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests expect
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test multi return values
-function expect_multiValues()
-  obj = {}
-  m.expect(obj, "mockMethod", 5, invalid, { "multiResult": ["one", 2, invalid, "last"] }, true)
-
-  result = obj.mockMethod()
-  m.assertEqual(result, "one")
-
-  result = obj.mockMethod()
-  m.assertEqual(result, 2)
-
-  result = obj.mockMethod()
-  m.assertEqual(result, invalid)
-
-  result = obj.mockMethod()
-  m.assertEqual(result, "last")
-
-  result = obj.mockMethod()
-  m.assertEqual(result, "last")
-
-  m.assertMocks()
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.assertFalse(isFail)
-
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests expect with overloaded expectOnce
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test simple test
-function expect_multiExpect_success()
-  obj = {}
-  arg1 = "arg1"
-  arg2 = "arg2"
-  arg3 = "arg3"
-  result1 = 1
-  result2 = 2
-  result3 = 3
-
-  m.expectOnce(obj, "mockMethod", [arg1], result1, true)
-  m.expectOnce(obj, "mockMethod", [arg2], result2, true)
-  m.expectOnce(obj, "mockMethod", [arg3], result3, true)
-
-  result = obj.mockMethod(arg1)
-  m.assertEqual(result, result1)
-
-  result = obj.mockMethod(arg2)
-  m.assertEqual(result, result2)
-
-  result = obj.mockMethod(arg3)
-  m.assertEqual(result, result3)
-
-  m.assertMocks()
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.assertFalse(isFail)
-end function
-
-
-'@Test can set up multi expects on same method - one invocation with any args
-function expect_multiExpect_success_oneCallsArgsNotTracked()
-  obj = {}
-  arg1 = "arg1"
-  arg2 = "arg2"
-  arg3 = "arg3"
-  result1 = 1
-  result2 = 2
-  result3 = 3
-
-  m.expectOnce(obj, "mockMethod", [arg1], result1, true)
-  m.expectOnce(obj, "mockMethod", invalid, result2, true)
-  m.expectOnce(obj, "mockMethod", [arg3], result3, true)
-
-  result = obj.mockMethod(arg1)
-  m.assertEqual(result, result1)
-
-  result = obj.mockMethod("do not care about args", "used in invocation", 2)
-  m.assertEqual(result, result2)
-
-  result = obj.mockMethod(arg3)
-  m.assertEqual(result, result3)
-
-  m.assertMocks()
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.assertFalse(isFail)
-
-end function
-
-'@Test can set up multi expects on same method - multi params
-function expect_multiExpect_multi_args_success()
-  obj = {}
-  arg1 = "arg1"
-  arg2 = "arg2"
-  arg3 = "arg3"
-  result1 = 1
-  result2 = 2
-  result3 = 3
-
-  m.expectOnce(obj, "mockMethod", [arg1, arg2, arg3], result1, true)
-  m.expectOnce(obj, "mockMethod", [arg2, arg3, arg1], result2, true)
-  m.expectOnce(obj, "mockMethod", [arg3, arg2, arg1], result3, true)
-
-  result = obj.mockMethod(arg1, arg2, arg3)
-  m.assertEqual(result, result1)
-
-  result = obj.mockMethod(arg2, arg3, arg1)
-  m.assertEqual(result, result2)
-
-  result = obj.mockMethod(arg3, arg2, arg1)
-  m.assertEqual(result, result3)
-
-  m.assertMocks()
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.assertFalse(isFail)
-
-end function
-
-'@Test multi test, multi params with other expects
-function expect_multiExpect_multi_args_others_success()
-  obj = {}
-  arg1 = "arg1"
-  arg2 = "arg2"
-  arg3 = "arg3"
-  result1 = 1
-  result2 = 2
-  result3 = 3
-
-  m.expectOnce(obj, "anotherMockMethod", invalid, "another", true)
-  m.expectOnce(obj, "anotherMockMethod2", [1, 2, 3], "another2", true)
-  m.expectOnce(obj, "mockMethod", [arg1, arg2, arg3], result1, true)
-  m.expectOnce(obj, "mockMethod", [arg2, arg3, arg1], result2, true)
-  m.expectOnce(obj, "mockMethod", [arg3, arg2, arg1], result3, true)
-
-  result = obj.anotherMockMethod()
-  m.assertEqual(result, "another")
-
-  result = obj.anotherMockMethod2(1, 2, 3)
-  m.assertEqual(result, "another2")
-
-  result = obj.mockMethod(arg1, arg2, arg3)
-  m.assertEqual(result, result)
-
-  result = obj.mockMethod(arg2, arg3, arg1)
-  m.assertEqual(result, result2)
-
-  result = obj.mockMethod(arg3, arg2, arg1)
-  m.assertEqual(result, result3)
-
-  m.assertMocks()
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.assertFalse(isFail)
-
-end function
-
-'@Test multi test, multi params with other expects - fail others
-function expect_multiExpect_multi_args_others_fail()
-  obj = {}
-  arg1 = "arg1"
-  arg2 = "arg2"
-  arg3 = "arg3"
-  result1 = 1
-  result2 = 2
-  result3 = 3
-
-  m.expectOnce(obj, "anotherMockMethod", ["not passed"], "another", true)
-  m.expectOnce(obj, "anotherMockMethod2", [1, 2, 3], "another2", true)
-  m.expectOnce(obj, "mockMethod", [arg1, arg2, arg3], result1, true)
-  m.expectOnce(obj, "mockMethod", [arg2, arg3, arg1], result2, true)
-  m.expectOnce(obj, "mockMethod", [arg3, arg2, arg1], result3, true)
-
-  result = obj.anotherMockMethod()
-  m.assertEqual(result, "another")
-
-  result = obj.anotherMockMethod2(1, 2, 3)
-  m.assertEqual(result, "another2")
-
-  result = obj.mockMethod(arg1, arg2, arg3)
-  m.assertEqual(result, result)
-
-  result = obj.mockMethod(arg2, arg3, arg1)
-  m.assertEqual(result, result2)
-
-  result = obj.mockMethod(arg3, arg2, arg1)
-  m.assertEqual(result, result3)
-
-  m.assertMocks()
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.assertTrue(isFail)
-
-end function
-
-'@Test can set up multi expects on same method
-'@Params["arg1_", "arg2", "arg3"]
-'@Params["arg1", "arg2", "arg3_"]
-'@Params["arg1", "arg2_", "arg3"]
-'@Params["arg1", "arg2_", "arg3"]
-'@Params["arg1_", "arg2_", "arg3"]
-'@Params["arg1_", invalid, "arg3"]
-function expect_multiExpect_fail(call1, call2, call3)
-  obj = {}
-  arg1 = "arg1"
-  arg2 = "arg2"
-  arg3 = "arg3"
-  result1 = 1
-  result2 = 2
-  result3 = 3
-
-  m.expectOnce(obj, "mockMethod", [arg1], result1, true)
-  m.expectOnce(obj, "mockMethod", [arg2], result2, true)
-  m.expectOnce(obj, "mockMethod", [arg3], result3, true)
-
-  result = obj.mockMethod(call1)
-  m.assertEqual(result, result1)
-
-  result = obj.mockMethod(call2)
-  m.assertEqual(result, result2)
-
-  result = obj.mockMethod(call2)
-  m.assertEqual(result, result3)
-
-  m.assertMocks()
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.assertTrue(isFail)
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests overloaded expectOnce on different objects
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test success
-function expect_multiExpect_differentOnj_success()
-  obj = {}
-  obj2 = {}
-  arg1 = "arg1"
-  arg2 = "arg2"
-  arg3 = "arg3"
-  result1 = 1
-  result2 = 2
-  result3 = 3
-
-  m.expectOnce(obj, "mockMethod", [arg1], result1, true)
-  m.expectOnce(obj, "mockMethod", [arg2], result2, true)
-  m.expectOnce(obj2, "mockMethod", [arg3], result3, true)
-
-  result = obj.mockMethod(arg1)
-  m.assertEqual(result, result1)
-
-  result = obj.mockMethod(arg2)
-  m.assertEqual(result, result2)
-
-  result = obj2.mockMethod(arg3)
-  m.assertEqual(result, result3)
-
-  m.assertMocks()
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.assertFalse(isFail)
-
-end function
-
-'@Test fail to match
-function expect_multiExpect_differentOnj_fail()
-  obj = {}
-  obj2 = {}
-  arg1 = "arg1"
-  arg2 = "arg2"
-  arg3 = "arg3"
-  result1 = 1
-  result2 = 2
-  result3 = 3
-
-  m.expectOnce(obj, "mockMethod", [arg1], result1, true)
-  m.expectOnce(obj, "mockMethod", [arg2], result2, true)
-  m.expectOnce(obj2, "mockMethod", [arg3], result3, true)
-
-  result = obj.mockMethod(arg1)
-  m.assertEqual(result, result1)
-
-  result = obj.mockMethod(arg2)
-  m.assertEqual(result, result2)
-
-  result = obj2.mockMethod(arg3)
-  m.assertEqual(result, result3)
-
-  m.assertMocks()
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.assertFalse(isFail)
-
-end function
-
-'ASSERTIONS TO WRITE TESTS FOR!
-
-'This is coming soon!
-
-'    AssertEqual
-'    AssertLike
-'    AssertNotEqual
-'    AssertInvalid
-'    AssertNotInvalid
-'    AssertAAHasKey
-'    AssertAANotHasKey
-'    AssertAAHasKeys
-'    AssertAANotHasKeys
-'    AssertArrayNotContains
-'    AssertArrayContainsSubset
-'    AssertArrayNotContainsSubsetet
-'    AssertArrayCount
-'    AssertArrayNotCount
-'    AssertArrayContainsOnly
-'    AssertType
-'    AssertSubType
-'
-'    'Node extensions
-'    AssertNodeCount
-'    AssertNodeNotCount
-'    AssertNodeEmpty
-'    AssertNodeNotEmpty
-'    AssertNodeContains
-'    AssertNodeNotContains
-'    AssertNodeContainsFields
-'    AssertNodeNotContainsFields
-
-'    AssertArray
-'    AssertAAContainsSubset
-'
-'    'Mocking and stubbing
-'    AssertMocks
-'    MockFail
-end namespace
\ No newline at end of file
diff --git a/gulpfile.ts b/gulpfile.ts
deleted file mode 100644
index 3b777e41..00000000
--- a/gulpfile.ts
+++ /dev/null
@@ -1,247 +0,0 @@
-import { series } from "gulp";
-import { RooibosProcessor, createProcessorConfig } from "rooibos-cli";
-import { BurpConfig, BurpProcessor } from 'burp-brightscript';
-import { ProgramBuilder } from 'brighterscript';
-
-const concat = require('gulp-concat');
-const gulp = require('gulp');
-const path = require('path');
-const del = require('del');
-const rimraf = require('rimraf');
-const header = require('gulp-header');
-const pkg = require('./package.json');
-const distDir = 'dist';
-const outDir = 'out';
-const buildDir = 'build';
-const distFile = `rooibosDist.brs`;
-const fullDistPath = path.join(distDir, distFile);
-const fs = require('fs');
-const minimist = require('minimist');
-const rmLines = require('gulp-rm-lines');
-const rokuDeploy = require('roku-deploy');
-const cp = require('child_process');
-
-const knownOptions = {
-  string: ['isCoverageBuild'],
-}
-
-const options = minimist(process.argv.slice(2), knownOptions);
-
-const args = {
-  host: process.env.ROKU_HOST || '192.168.16.3',
-  username: process.env.ROKU_USER || 'rokudev',
-  password: process.env.ROKU_PASSWORD || 'aaaa',
-  rootDir: './',
-  files: ['frameworkTests/**/*'],
-  outDir: './out',
-  retainStagingFolder: true
-};
-
-export function clean() {
-  const distPath = path.join(distDir, '**');
-  return del([distPath, outDir], { force: true });
-}
-
-function createDirectories() {
-  return gulp.src('*.*', { read: false })
-    .pipe(gulp.dest(distDir))
-    .pipe(gulp.dest(outDir));
-}
-
-export function prepareBuildDir() {
-  del.sync([buildDir], { force: true });
-  const response = gulp.src('*.*', { read: false })
-    .pipe(gulp.dest(buildDir));
-  return response;
-}
-
-export async function compile(cb) {
-  let builder = new ProgramBuilder();
-  console.log('333');
-  await builder.run({
-    rootDir: "frameworkTests",
-    stagingFolderPath: buildDir,
-    createPackage: false
-  });
-  console.log('444');
-}
-
-export async function compileFramework() {
-  let builder = new ProgramBuilder();
-  await builder.run({
-    rootDir: "src",
-    files: [{
-      src: "**/*.*",
-      dest: 'source'
-    }],
-    stagingFolderPath: buildDir,
-    createPackage: false
-  })
-  await new Promise((resolve) => {
-    return gulp.src(buildDir + '/source/**/*.brs')
-      .pipe(gulp.dest(buildDir))
-      .on('end', resolve);
-  });
-  rimraf.sync(path.join(buildDir, 'source'));
-}
-
-
-function squash() {
-  var banner = [`'/**`,
-    `' * ${pkg.name} - ${pkg.description}`,
-    `' * @version v${pkg.version}`,
-    `' * @link ${pkg.homepage}`,
-    `' * @license ${pkg.license}`,
-    `' */`,
-    ``].join(`\n`);
-
-  return gulp.src('./build/*.brs')
-    .pipe(concat(distFile))
-    .pipe(rmLines({
-      'filters': [/^\s*'(?!bs:disable)/i, /((\r\n|\n|\r)$)|(^(\r\n|\n|\r))|^\s*$/i]
-    }))
-    .pipe(header(banner, { pkg: pkg }))
-    .pipe(gulp.dest(distDir));
-}
-
-function copyToSamples(cb) {
-  const frameworkFile = path.join('samples/example/source/tests/rooibos', distFile);
-  if (fs.existsSync(frameworkFile)) {
-    fs.unlinkSync(frameworkFile);
-  }
-  fs.copyFileSync(fullDistPath, frameworkFile);
-  cb();
-}
-
-function copyToTests(cb) {
-  const frameworkFile = path.join('frameworkTests/source/tests', distFile);
-  if (fs.existsSync(frameworkFile)) {
-    fs.unlinkSync(frameworkFile);
-  }
-  fs.copyFileSync(fullDistPath, frameworkFile);
-  cb();
-}
-
-/**
- * This target is used for CI
- */
-
-export async function prepareFrameworkTests(cb) {
-  await rokuDeploy.prepublishToStaging(args);
-  console.log(`running rooibos processor coverage: ${options.isCoverageBuild === 'true'}`);
-  let config = createProcessorConfig({
-    "projectPath": "build",
-    "testsFilePattern": [
-      "**/tests/**/*.brs",
-      "!**/rooibosDist.brs",
-      "!**/rooibosFunctionMap.brs",
-      "!**/TestsScene.brs"
-    ],
-    sourceFilePattern: [
-      '**/*.brs',
-      '**/*.xml',
-      '!**/rLog',
-      '!**/rLog/**/*.*',
-      '!**/rLogComponents',
-      '!**/rLogComponents/**/*.*',
-      '!**/rooibosDist.brs',
-      '!**/rooibosFunctionMap.brs',
-      '!**/TestsScene.brs',
-      '!**/ThreadUtils.brs'
-    ],
-
-    "outputPath": path.join("source", "tests"),
-    showFailuresOnly: true,
-    isRecordingCodeCoverage: options.isCoverageBuild === 'true',
-    printLcov: true
-  });
-  let processor = new RooibosProcessor(config);
-  await processor.processFiles();
-
-  cb();
-}
-
-export async function prepareCodeCoverageTests(cb) {
-  await rokuDeploy.prepublishToStaging(args);
-
-  let config = createProcessorConfig({
-    "projectPath": "out/.roku-deploy-staging",
-    "testsFilePattern": [
-      "**/tests/**/*.brs",
-      "!**/rooibosDist.brs",
-      "!**/rooibosFunctionMap.brs",
-      "!**/TestsScene.brs"
-    ],
-    "sourceFilePattern": [
-      "**/*.brs",
-      "**/*.xml",
-      "!**/tests",
-      "!**/rLog",
-      "!**/rLogComponents",
-      "!**/rooibosDist.brs",
-      "!**/rooibosFunctionMap.brs",
-      "!**/TestsScene.brs",
-      "!**/ThreadUtils.brs"
-    ],
-    "isRecordingCodeCoverage": true
-  });
-  let processor = new RooibosProcessor(config);
-  processor.processFiles();
-
-  cb();
-}
-
-export async function zipFrameworkTests(cb) {
-  await rokuDeploy.zipPackage(args);
-}
-
-export async function deployFrameworkTests(cb) {
-  await rokuDeploy.publish(args);
-}
-
-export function doc(cb) {
-  let task = cp.exec('./node_modules/.bin/jsdoc -c jsdoc.json -t node_modules/minami -d docs');
-  return task;
-}
-
-export function updateVersion(cb) {
-  fs.writeFileSync("docs/version.txt", pkg.version);
-  cb();
-}
-
-export function applyBurpPreprocessing(cb) {
-  const currentPath = process.cwd();
-  let replacements = null;
-
-  replacements = [{
-    regex: `($.*)'##'bs:disable-next-line`,
-    replacement: `$1\n'bs:disable-next-line`
-  }];
-  let config: BurpConfig = {
-    sourcePath: 'build',
-    globPattern: '**/*.brs',
-    replacements: replacements
-  };
-
-  const processor = new BurpProcessor(config);
-  processor.processFiles();
-  console.log(`Resetting path to ${currentPath}`);
-  process.chdir(currentPath);
-  cb();
-}
-
-
-function insertVersionNumber(cb) {
-  const filePath = path.join(buildDir, 'Rooibos.brs');
-  let text = fs.readFileSync(filePath, 'utf8');
-  text = text.replace('#ROOIBOS_VERSION#', pkg.version);
-  fs.writeFileSync(filePath, text, 'utf8');
-  cb();
-}
-
-exports.build = series(clean, createDirectories, compileFramework, insertVersionNumber, squash, applyBurpPreprocessing, copyToSamples, copyToTests);
-exports.buildFrameworkTests = series(exports.build, prepareBuildDir, compile);
-exports.runFrameworkTests = series(exports.buildFrameworkTests, prepareFrameworkTests, zipFrameworkTests, deployFrameworkTests)
-exports.prePublishFrameworkTests = series(exports.buildFrameworkTests, prepareFrameworkTests)
-exports.prePublishFrameworkCodeCoverage = series(exports.buildFrameworkTests, prepareCodeCoverageTests)
-exports.dist = series(exports.build, doc, updateVersion);
\ No newline at end of file
diff --git a/outRun/.roku-deploy-staging/components/TestsScene.xml b/outRun/.roku-deploy-staging/components/TestsScene.xml
deleted file mode 100644
index 9d5b14a5..00000000
--- a/outRun/.roku-deploy-staging/components/TestsScene.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component name="TestsScene" extends="Scene">
-  <children>
-    <LayoutGroup>
-      <Label text="Rooibos tests are running" />
-    </LayoutGroup>
-  </children>
-</component>
\ No newline at end of file
diff --git a/outRun/.roku-deploy-staging/manifest b/outRun/.roku-deploy-staging/manifest
deleted file mode 100644
index 9a12c564..00000000
--- a/outRun/.roku-deploy-staging/manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-title=Rooibos
-major_version=0
-minor_version=2
-build_version=0
diff --git a/outRun/.roku-deploy-staging/source/main.brs b/outRun/.roku-deploy-staging/source/main.brs
deleted file mode 100644
index c7639c93..00000000
--- a/outRun/.roku-deploy-staging/source/main.brs
+++ /dev/null
@@ -1,57 +0,0 @@
-sub Main(args as dynamic)
-    if (type(Rooibos__Init) = "Function") then Rooibos__Init(SetupGlobals, "AddTestUtils", invalid, m)
-
-    InitScreen()
-end sub
-
-function InitScreen() as void
-    'this will be where you setup your typical roku app
-    'it will not be launched when running unit tests
-    screen = CreateObject("roSGScreen")
-    m.port = CreateObject("roMessagePort")
-    screen.setMessagePort(m.port)
-    
-    rootScene = screen.CreateScene("TestsScene")
-    rootScene.id = "ROOT"
-    
-    screen.show()
-
-    SetupGlobals(screen)
-    
-    while(true)
-        msg = wait(0, m.port)
-        msgType = type(msg)
-      
-        if msgType = "roSGScreenEvent"
-            if msg.isScreenClosed() 
-                return
-            end if
-        end if
-    end while
-end function
-
-
-'*************************************************************
-'** SetupGlobals
-'** @param screen as roScreen - screen to set globals on
-'*************************************************************
-function SetupGlobals(screen) as void
-    ? "SETTTING UP GLOBALS - do your standard setup stuff here"
-
-    m.global = screen.getGlobalNode()
-
-    m.roDeviceInfo = CreateObject("roDeviceInfo")
-    
-    m.displayInfo = {
-        resolution: m.roDeviceInfo.GetUIResolution() 
-        displayType: m.roDeviceInfo.GetDisplayType() 
-        width: m.roDeviceInfo.GetDisplaySize().w
-        height: m.roDeviceInfo.GetDisplaySize().h
-        wFactor: m.roDeviceInfo.GetDisplaySize().w/1920
-        hFactor: m.roDeviceInfo.GetDisplaySize().h/1080
-    }
-
-    m.modelLocator = {"displayInfo":m.displayInfo} ' contrived example : this would be a specifc modelLocator node/other setup thing
-
-    m.global.addFields({"modelLocator": m.modelLocator})
-end function
diff --git a/outRun/.roku-deploy-staging/source/tests/AssertionTests.brs b/outRun/.roku-deploy-staging/source/tests/AssertionTests.brs
deleted file mode 100644
index 6eba2846..00000000
--- a/outRun/.roku-deploy-staging/source/tests/AssertionTests.brs
+++ /dev/null
@@ -1,660 +0,0 @@
-'@TestSuite [RBSA] Rooibos assertion tests
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests basic assertions
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test Fail
-function Simp_basic_Fail() as void
-
-  assertResult = m.Fail("reason")
-
-  isFail = m.currentResult.isFail
-  m.currentResult.Reset()
-
-  m.AssertFalse(assertResult)
-  m.AssertTrue(isFail)
-end function
-
-'@Test AssertTrue
-'@Params[true, true]
-'@Params[false, false]
-'@Params[invalid, false]
-'@Params[0, false]
-'@Params[1, false]
-'@Params["test", false]
-function Simp_basic_AssertTrue(value, expectedAssertResult) as void
-
-  assertResult = m.AssertTrue(value)
-  isFail = m.currentResult.isFail
-  m.currentResult.Reset()
-
-  m.AssertEqual(assertResult, expectedAssertResult)
-  m.AssertEqual(isFail, not expectedAssertResult)
-end function
-
-'@Test AssertFalse
-'@Params[false, true]
-'@Params[true, false]
-'@Params[invalid, false]
-'@Params[0, false]
-'@Params[1, false]
-'@Params["test", false]
-function Simp_basic_AssertFalse(value, expectedAssertResult) as void
-
-  assertResult = m.AssertFalse(value)
-
-  isFail = m.currentResult.isFail
-  m.currentResult.Reset()
-
-  m.AssertEqual(assertResult, expectedAssertResult)
-  m.AssertEqual(isFail, not expectedAssertResult)
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests AssertArrayContainsAAs
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test Fail
-'@Params[[{"one":1}], [{"one":2}]]
-'@Params[[{"one":1}], [{"one":"a"}]]
-'@Params[[{"one":1}], [{}]]
-'@Params[[{"one":1}], [invalid]]
-'@Params[[{"one":1}], []]
-'@Params[[{"one":1}], invalid]
-'@Params[[{"one":1}], [[]] ]
-'@Params[[{"one":1}], ["wrong"] ]
-'@Params[[{"one":1}], [2] ]
-'@Params[[{"one":"a"}], [{"one":1}] ]
-'@Params[[{"two":1}], [{"one":1}] ]
-'@Params[[invalid], [{"one":1}] ]
-'@Params[invalid, [{"one":1}] ]
-'@Params[[{"one":1, "two":2}], [{"one":"1"}] ]
-'@Params[[{"one":1}, {"two":2}], [{"one":"1"}, {"two":"a"}] ]
-'@Params[[{"one":1}, {"two":2}], [{"a":1}, {"a":1}, {"a":1}] ]
-function Simp_AssertArrayContainsAAs_Fail(expectedAAs, items) as void
-
-  assertResult = m.AssertArrayContainsAAs(items, expectedAAs)
-
-  isFail = m.currentResult.isFail
-  m.currentResult.Reset()
-
-  m.AssertFalse(assertResult)
-  m.AssertTrue(isFail)
-end function
-
-
-'@Test pass
-'@Params[[], []]
-'@Params[[{}], [{}]]
-'@Params[[{"one":1}], [{"one":1}]]
-'@Params[[{"one":1, "two":2}], [{"one":1, "two":2}]]
-'@Params[[{"one":1, "two":2}], [{ "two":2, "one":1}]]
-'@Params[[{"one":1, "two":2}, {"one":1}], [{"one":1}, { "two":2, "one":1}]]
-'@Params[[{"one":1, "two":2}, {"one":1}, {"three":3}], [{"one":1}, {"three":3}, { "two":2, "one":1}]]
-function Simp_AssertArrayContainsAAs_Pass(expectedAAs, items) as void
-
-  assertResult = m.AssertArrayContainsAAs(items, expectedAAs)
-
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.AssertTrue(assertResult)
-  m.AssertFalse(isFail)
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests global is present on testSuite
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@BeforeEach
-function Simp_AssertGlobal_beforeEach() as void
-  m.beforeEachGlobal = m.global
-end function
-
-'@AfterEach
-function Simp_AssertGlobal_afterEach() as void
-  m.afterEachGlobal = m.global
-end function
-
-'@Test global is in test
-function Simp_AssertGlobalIsPassedIntoTest() as void
-  m.AssertNotInvalid(m.global)
-end function
-
-'@Test global is in before each and after each
-function Simp_AssertGlobalIsPassedInto_beforeEach_and_afterEach() as void
-  m.AssertNotInvalid(m.global)
-  m.AssertNotInvalid(m.beforeEachGlobal)
-  m.AssertNotInvalid(m.afterEachGlobal)
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests AssertArrayContainsOnlyValuesOfType
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test pass
-'@Params[["one", "two", "three"], "String"]
-'@Params[[1, 2, 3], "Integer"]
-'@Params[[true, true, false], "Boolean"]
-'@Params[[[true, true], [false, false]], "Array"]
-'@Params[[{"test":1}, {"test":1}], "AssociativeArray"]
-function Simp_AssertArrayContainsOnlyValuesOfType_Pass(values, typeName) as void
-
-  assertResult = m.AssertArrayContainsOnlyValuesOfType(values, typeName)
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.AssertTrue(assertResult)
-  m.AssertFalse(isFail)
-
-end function
-
-'@Test fail
-'@Params[["one", 2, "three"], "String"]
-'@Params[[1, "two", 3], "Integer"]
-'@Params[[true, "true", false], "Boolean"]
-'@Params[[[true, true], false, false], "Array"]
-'@Params[[{"test":1}, "notAA"], "AssociativeArray"]
-'@Params[["one", "two", "three"], "UnknownType"]
-'@Params[["one", "two", "three"], "Integer"]
-'@Params[[1, 2, 3], "String"]
-'@Params[[true, true, false], "String"]
-'@Params[[[true, true], [false, false]], "AssociativeArray"]
-'@Params[[{"test":1}, {"test":1}], "Array"]
-function Simp_AssertArrayContainsOnlyValuesOfType_Fail(values, typeName) as void
-
-  assertResult = m.AssertArrayContainsOnlyValuesOfType(values, typeName)
-  isFail = m.currentResult.isFail
-
-  isFail = m.currentResult.isFail
-  m.currentResult.Reset()
-
-  m.AssertFalse(assertResult)
-  m.AssertTrue(isFail)
-
-
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests white spaces work with annotations
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'some comments to
-'demonstrate
-'@Test comments between tests
-'that we can have comments
-'between functions and tags
-function Simp_whiteSpacing() as void
-  m.AssertTrue(true)
-end function
-
-'some comments to
-'demonstrate
-'@Test comments between tests with params
-'@Params[1]
-
-'@Params[2]
-'that we can have comments
-'@Params[3]
-'between functions and tags
-'@Params[4]
-
-function Simp_whiteSpacing_params(value) as void
-  m.AssertTrue(true)
-end function
-
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests EqArray
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test
-'@Params[invalid, [], false]
-'@Params[[], invalid, false]
-'@Params[invalid, invalid, false]
-'@Params[["one", "three"], [], false]
-'@Params[[], ["one", "three"], false]
-'@Params[[], [], true]
-'@Params[["one", "two", "three"], ["one", "three"], false]
-'@Params[["one", "two", "three"], ["one", "two", "three"], true]
-'@Params[[1, 2, 3], ["one", "two", "three"], false]
-'@Params[[1, 2, 3], [1, 2, 3], true]
-'@Params[[1, invalid, "3"], [1, invalid, "3"], true]
-'@Params[[3, 2, 1], [1, 2, 3], false]
-function Simp_EqArray_Pass(values, values2, expected) as void
-
-  result = m.EqArray(values, values2)
-  m.AssertEqual(result, expected)
-
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests AssertNotEmpty
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test pass
-'@Params[["one", "two", "three"]]
-'@Params[[1, 2, 3]]
-'@Params[[true]]
-'@Params[[[true, true], [false, false]]]
-'@Params[[{"test":1}]]
-'@Params["not empty"]
-'@Params[[invalid]]
-function Simp_AssertNotEmpty_Pass(values) as void
-
-  assertResult = m.AssertNotEmpty(values)
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.AssertTrue(assertResult)
-  m.AssertFalse(isFail)
-
-end function
-
-'@Test fail
-'@Params[invalid]
-'@Params[[]]
-'@Params[{}]
-'@Params[1]
-'@Params[""]
-function Simp_AssertNotEmpty_Fail(values) as void
-
-  assertResult = m.AssertNotEmpty(values)
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.AssertFalse(assertResult)
-  m.AssertTrue(isFail)
-
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests AssertEmpty
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test pass
-'@Params[[]]
-'@Params[{}]
-'@Params[""]
-function Simp_AssertEmpty_Pass(values) as void
-
-  assertResult = m.AssertEmpty(values)
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.AssertTrue(assertResult)
-  m.AssertFalse(isFail)
-
-end function
-
-'@Test fail
-'@Params[1]
-'@Params[invalid]
-'@Params[["one", "two", "three"]]
-'@Params[[1, 2, 3]]
-'@Params[[true]]
-'@Params[[[true, true], [false, false]]]
-'@Params[[{"test":1}]]
-'@Params["not empty"]
-'@Params[[invalid]]
-function Simp_AssertEmpty_Fail(values) as void
-
-  assertResult = m.AssertEmpty(values)
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.AssertFalse(assertResult)
-  m.AssertTrue(isFail)
-
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests expect
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test multi return values
-function Simp_expect_multiValues()
-  obj = {}
-  m.expect(obj, "mockMethod", 5, invalid, {"multiResult": ["one", 2, invalid, "last"]}, true)
-
-  result = obj.mockMethod()
-  m.AssertEqual(result, "one")
-
-  result = obj.mockMethod()
-  m.AssertEqual(result, 2)
-
-  result = obj.mockMethod()
-  m.AssertEqual(result, invalid)
-
-  result = obj.mockMethod()
-  m.AssertEqual(result, "last")
-
-  result = obj.mockMethod()
-  m.AssertEqual(result, "last")
-
-  m.assertMocks()
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.AssertFalse(isFail)
-
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests expect with overloaded expectOnce
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test simple test
-function Simp_expect_multiExpect_success()
-  obj = {}
-  arg1 = "arg1"
-  arg2 = "arg2"
-  arg3 = "arg3"
-  result1 = 1
-  result2 = 2
-  result3 = 3
-
-  m.expectOnce(obj, "mockMethod", [arg1], result1, true)
-  m.expectOnce(obj, "mockMethod", [arg2], result2, true)
-  m.expectOnce(obj, "mockMethod", [arg3], result3, true)
-
-  result = obj.mockMethod(arg1)
-  m.AssertEqual(result, result1)
-
-  result = obj.mockMethod(arg2)
-  m.AssertEqual(result, result2)
-
-  result = obj.mockMethod(arg3)
-  m.AssertEqual(result, result3)
-
-  m.assertMocks()
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.AssertFalse(isFail)
-end function
-
-
-'@Test can set up multi expects on same method - one invocation with any args
-function Simp_expect_multiExpect_success_oneCallsArgsNotTracked()
-  obj = {}
-  arg1 = "arg1"
-  arg2 = "arg2"
-  arg3 = "arg3"
-  result1 = 1
-  result2 = 2
-  result3 = 3
-
-  m.expectOnce(obj, "mockMethod", [arg1], result1, true)
-  m.expectOnce(obj, "mockMethod", invalid, result2, true)
-  m.expectOnce(obj, "mockMethod", [arg3], result3, true)
-
-  result = obj.mockMethod(arg1)
-  m.AssertEqual(result, result1)
-
-  result = obj.mockMethod("do not care about args", "used in invocation", 2)
-  m.AssertEqual(result, result2)
-
-  result = obj.mockMethod(arg3)
-  m.AssertEqual(result, result3)
-
-  m.assertMocks()
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.AssertFalse(isFail)
-
-end function
-
-'@Test can set up multi expects on same method - multi params
-function Simp_expect_multiExpect_multi_args_success()
-  obj = {}
-  arg1 = "arg1"
-  arg2 = "arg2"
-  arg3 = "arg3"
-  result1 = 1
-  result2 = 2
-  result3 = 3
-
-  m.expectOnce(obj, "mockMethod", [arg1, arg2, arg3], result1, true)
-  m.expectOnce(obj, "mockMethod", [arg2, arg3, arg1], result2, true)
-  m.expectOnce(obj, "mockMethod", [arg3, arg2, arg1], result3, true)
-
-  result = obj.mockMethod(arg1, arg2, arg3)
-  m.AssertEqual(result, result1)
-
-  result = obj.mockMethod(arg2, arg3, arg1)
-  m.AssertEqual(result, result2)
-
-  result = obj.mockMethod(arg3, arg2, arg1)
-  m.AssertEqual(result, result3)
-
-  m.assertMocks()
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.AssertFalse(isFail)
-
-end function
-
-'@Test multi test, multi params with other expects
-function Simp_expect_multiExpect_multi_args_others_success()
-  obj = {}
-  arg1 = "arg1"
-  arg2 = "arg2"
-  arg3 = "arg3"
-  result1 = 1
-  result2 = 2
-  result3 = 3
-
-  m.expectOnce(obj, "anotherMockMethod", invalid, "another", true)
-  m.expectOnce(obj, "anotherMockMethod2", [1,2,3], "another2", true)
-  m.expectOnce(obj, "mockMethod", [arg1, arg2, arg3], result1, true)
-  m.expectOnce(obj, "mockMethod", [arg2, arg3, arg1], result2, true)
-  m.expectOnce(obj, "mockMethod", [arg3, arg2, arg1], result3, true)
-
-  result = obj.anotherMockMethod()
-  m.AssertEqual(result, "another")
-
-  result = obj.anotherMockMethod2(1, 2, 3)
-  m.AssertEqual(result, "another2")
-
-  result = obj.mockMethod(arg1, arg2, arg3)
-  m.AssertEqual(result, result)
-
-  result = obj.mockMethod(arg2, arg3, arg1)
-  m.AssertEqual(result, result2)
-
-  result = obj.mockMethod(arg3, arg2, arg1)
-  m.AssertEqual(result, result3)
-
-  m.assertMocks()
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.AssertFalse(isFail)
-
-end function
-
-'@Test multi test, multi params with other expects - fail others
-function Simp_expect_multiExpect_multi_args_others_fail()
-  obj = {}
-  arg1 = "arg1"
-  arg2 = "arg2"
-  arg3 = "arg3"
-  result1 = 1
-  result2 = 2
-  result3 = 3
-
-  m.expectOnce(obj, "anotherMockMethod", ["not passed"], "another", true)
-  m.expectOnce(obj, "anotherMockMethod2", [1,2,3], "another2", true)
-  m.expectOnce(obj, "mockMethod", [arg1, arg2, arg3], result1, true)
-  m.expectOnce(obj, "mockMethod", [arg2, arg3, arg1], result2, true)
-  m.expectOnce(obj, "mockMethod", [arg3, arg2, arg1], result3, true)
-
-  result = obj.anotherMockMethod()
-  m.AssertEqual(result, "another")
-
-  result = obj.anotherMockMethod2(1, 2, 3)
-  m.AssertEqual(result, "another2")
-
-  result = obj.mockMethod(arg1, arg2, arg3)
-  m.AssertEqual(result, result)
-
-  result = obj.mockMethod(arg2, arg3, arg1)
-  m.AssertEqual(result, result2)
-
-  result = obj.mockMethod(arg3, arg2, arg1)
-  m.AssertEqual(result, result3)
-
-  m.assertMocks()
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.AssertTrue(isFail)
-
-end function
-
-'@Test can set up multi expects on same method
-'@Params["arg1_", "arg2", "arg3"]
-'@Params["arg1", "arg2", "arg3_"]
-'@Params["arg1", "arg2_", "arg3"]
-'@Params["arg1", "arg2_", "arg3"]
-'@Params["arg1_", "arg2_", "arg3"]
-'@Params["arg1_", invalid, "arg3"]
-function Simp_expect_multiExpect_fail(call1, call2, call3)
-  obj = {}
-  arg1 = "arg1"
-  arg2 = "arg2"
-  arg3 = "arg3"
-  result1 = 1
-  result2 = 2
-  result3 = 3
-
-  m.expectOnce(obj, "mockMethod", [arg1], result1, true)
-  m.expectOnce(obj, "mockMethod", [arg2], result2, true)
-  m.expectOnce(obj, "mockMethod", [arg3], result3, true)
-
-  result = obj.mockMethod(call1)
-  m.AssertEqual(result, result1)
-
-  result = obj.mockMethod(call2)
-  m.AssertEqual(result, result2)
-
-  result = obj.mockMethod(call2)
-  m.AssertEqual(result, result3)
-
-  m.assertMocks()
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.AssertTrue(isFail)
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests overloaded expectOnce on different objects
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test success
-function Simp_expect_multiExpect_differentOnj_success()
-  obj = {}
-  obj2 = {}
-  arg1 = "arg1"
-  arg2 = "arg2"
-  arg3 = "arg3"
-  result1 = 1
-  result2 = 2
-  result3 = 3
-
-  m.expectOnce(obj, "mockMethod", [arg1], result1, true)
-  m.expectOnce(obj, "mockMethod", [arg2], result2, true)
-  m.expectOnce(obj2, "mockMethod", [arg3], result3, true)
-
-  result = obj.mockMethod(arg1)
-  m.AssertEqual(result, result1)
-
-  result = obj.mockMethod(arg2)
-  m.AssertEqual(result, result2)
-
-  result = obj2.mockMethod(arg3)
-  m.AssertEqual(result, result3)
-
-  m.assertMocks()
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.AssertFalse(isFail)
-
-end function
-
-'@Test fail to match
-function Simp_expect_multiExpect_differentOnj_fail()
-  obj = {}
-  obj2 = {}
-  arg1 = "arg1"
-  arg2 = "arg2"
-  arg3 = "arg3"
-  result1 = 1
-  result2 = 2
-  result3 = 3
-
-  m.expectOnce(obj, "mockMethod", [arg1], result1, true)
-  m.expectOnce(obj, "mockMethod", [arg2], result2, true)
-  m.expectOnce(obj2, "mockMethod", [arg3], result3, true)
-
-  result = obj.mockMethod(arg1)
-  m.AssertEqual(result, result1)
-
-  result = obj.mockMethod(arg2)
-  m.AssertEqual(result, result2)
-
-  result = obj2.mockMethod(arg3)
-  m.AssertEqual(result, result3)
-
-  m.assertMocks()
-  isFail = m.currentResult.isFail
-
-  m.currentResult.Reset()
-  m.AssertFalse(isFail)
-
-end function
-
-'ASSERTIONS TO WRITE TESTS FOR!
-
-'This is coming soon!
-
-'    AssertEqual
-'    AssertLike
-'    AssertNotEqual
-'    AssertInvalid
-'    AssertNotInvalid
-'    AssertAAHasKey
-'    AssertAANotHasKey
-'    AssertAAHasKeys
-'    AssertAANotHasKeys
-'    AssertArrayNotContains
-'    AssertArrayContainsSubset
-'    AssertArrayNotContainsSubsetet
-'    AssertArrayCount
-'    AssertArrayNotCount
-'    AssertArrayContainsOnly
-'    AssertType
-'    AssertSubType
-'
-'    'Node extensions
-'    AssertNodeCount
-'    AssertNodeNotCount
-'    AssertNodeEmpty
-'    AssertNodeNotEmpty
-'    AssertNodeContains
-'    AssertNodeNotContains
-'    AssertNodeContainsFields
-'    AssertNodeNotContainsFields
-
-'    AssertArray
-'    AssertAAContainsSubset
-'
-'    'Mocking and stubbing
-'    AssertMocks
-'    MockFail
\ No newline at end of file
diff --git a/outRun/.roku-deploy-staging/source/tests/ExpectTests.brs b/outRun/.roku-deploy-staging/source/tests/ExpectTests.brs
deleted file mode 100644
index 114ce322..00000000
--- a/outRun/.roku-deploy-staging/source/tests/ExpectTests.brs
+++ /dev/null
@@ -1,28 +0,0 @@
-'@TestSuite ET ExpectTests
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests bug with expectOnce not matching values
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test reported case
-'@Params[[52], true]
-'@Params[invalid, false]
-'@Params[[invalid], true]
-'@Params[["42"], true]
-'@Params[[42], false]
-function ET_expectOnce_valuesBug_reported(expectedValue, expectMockFail) as void
-    obj = {
-        foo: function(arg0) : return arg0 : end function
-    }
-
-    m.ExpectOnce(obj, "foo", expectedValue)
-    obj.foo(42)
-    m.isAutoAssertingMocks = false
-    m.AssertMocks()
-    
-    isFail = m.currentResult.isFail
-    m.currentResult.Reset()
-    m.CleanMocks()
-    m.AssertEqual(isFail, expectMockFail)     
-end function
-
diff --git a/outRun/.roku-deploy-staging/source/tests/ParamsTests.brs b/outRun/.roku-deploy-staging/source/tests/ParamsTests.brs
deleted file mode 100644
index a7ebed10..00000000
--- a/outRun/.roku-deploy-staging/source/tests/ParamsTests.brs
+++ /dev/null
@@ -1,32 +0,0 @@
-'@TestSuite PT ParamsTests
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests that nodes are created with RBSNode
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test
-'@Params["#RBSNode", "ContentNode"]
-'@Params["#RBSNode|Group", "Group"]
-'@Params["#RBSNode|Label", "Label"]
-function PT_RBSNodeDirective(node, expectedNodeType) as void
-  m.assertSubType(node, expectedNodeType)
-end function
-
-'@Test node parsed as other arg index
-'@Params[1, 2, 3, "#RBSNode", "ContentNode"]
-'@Params[1, 2, 3, "#RBSNode|Group", "Group"]
-'@Params[1, 2, 3, "#RBSNode|Label", "Label"]
-function PT_RBSNodeDirective_otherArgs(arg1, arg2, arg3, node, expectedNodeType) as void
-  m.assertSubType(node, expectedNodeType)
-  m.assertEqual(arg1, 1)
-  m.assertEqual(arg2, 2)
-  m.assertEqual(arg3, 3)
-end function
-
-'@Test does not affect regular params
-'@Params["#someValue", "#someValue"]
-'@Params[22, 22]
-'@Params[[1,2,3], [1,2,3]]
-function PT_RBSNodeDirective_noSideEffect(arg1, expectedValue) as void
-  m.assertEqual(arg1, expectedValue)
-end function
\ No newline at end of file
diff --git a/outRun/.roku-deploy-staging/source/tests/issue_13_afterEach_not_running.brs b/outRun/.roku-deploy-staging/source/tests/issue_13_afterEach_not_running.brs
deleted file mode 100644
index 228c7df5..00000000
--- a/outRun/.roku-deploy-staging/source/tests/issue_13_afterEach_not_running.brs
+++ /dev/null
@@ -1,48 +0,0 @@
-'@TestSuite [DGNT] Duplicate Group Name Tests
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It group1
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test simple
-function DGNT_group1_test()
-  m.AssertTrue(true)
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It group2
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test simple
-function DGNT_group2_test()
-  m.AssertTrue(true)
-end function
-
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It group2
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test simple
-function DGNT_group2_dupe_test()
-  m.AssertTrue(true)
-end function
-
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It group3
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test simple
-function DGNT_group3_test()
-  m.AssertTrue(true)
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It group1
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test simple
-function DGNT_group1_dupe_test()
-  m.AssertTrue(true)
-end function
\ No newline at end of file
diff --git a/outRun/.roku-deploy-staging/source/tests/issue_15_tests_only_on_groups.brs b/outRun/.roku-deploy-staging/source/tests/issue_15_tests_only_on_groups.brs
deleted file mode 100644
index 67b33e76..00000000
--- a/outRun/.roku-deploy-staging/source/tests/issue_15_tests_only_on_groups.brs
+++ /dev/null
@@ -1,30 +0,0 @@
-'ADD '@Only ON NEXT LINE TO TEST
-'@TestSuite [RBSA] Rooibos before after tests
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests one
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test it one
-function RBSA__it_test_one() as void
-    m.AssertTrue(true)
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests two
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test it two
-function RBSA__it_test_two() as void
-    m.AssertTrue(true)
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'ADD '@Only ON NEXT LINE TO TEST
-'@It tests three
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test it three
-function RBSA__it_test_three() as void
-    m.AssertTrue(true)
-end function
\ No newline at end of file
diff --git a/outRun/.roku-deploy-staging/source/tests/issue_5_duplicateGroupNames.brs b/outRun/.roku-deploy-staging/source/tests/issue_5_duplicateGroupNames.brs
deleted file mode 100644
index 1725a4bb..00000000
--- a/outRun/.roku-deploy-staging/source/tests/issue_5_duplicateGroupNames.brs
+++ /dev/null
@@ -1,28 +0,0 @@
-'@TestSuite [RBSA] Rooibos before after tests
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests before each and after each are running
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@BeforeEach
-function RBSA__BeforeEach() as void
-  ? "!!! Before"
-end function
-
-
-'@AfterEach
-function RBSA__AfterEach() as void
-    ? "!!! After"
-end function
-
-'@Test before after
-function RBSA__before_after() as void
-
-    assertResult = m.Fail("reason")
-
-    isFail = m.currentResult.isFail
-    m.currentResult.Reset()
-
-    m.AssertFalse(assertResult)
-    m.AssertTrue(isFail)
-end function
\ No newline at end of file
diff --git a/outRun/.roku-deploy-staging/source/tests/verifyBeforeEachAfterEach.brs b/outRun/.roku-deploy-staging/source/tests/verifyBeforeEachAfterEach.brs
deleted file mode 100644
index 5bfae93e..00000000
--- a/outRun/.roku-deploy-staging/source/tests/verifyBeforeEachAfterEach.brs
+++ /dev/null
@@ -1,100 +0,0 @@
-'@TestSuite [BEAER] BeforeEach and AfterEach Running
-
-'@Setup
-function BEAER_Setup() as void
-  ? "!!! Setup"
-end function
-
-
-'@TearDown
-function BEAER_TearDown() as void
-    ? "!!! TearDown"
-end function
-
-'@BeforeEach
-function BEAER_BeforeEach() as void
-  ? "!!! Before"
-end function
-
-
-'@AfterEach
-function BEAER_AfterEach() as void
-    ? "!!! After"
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests group 1 - should have global before/after 
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test 1 
-function BEAER_group1_1() as void
-  m.AssertTrue(true)
-end function
-
-'@Test 2
-function BEAER_group1_2() as void
-  m.AssertTrue(true)
-end function
-
-'@Test 3
-'@Params["a"]
-'@Params["b"]
-'@Params["c"]
-function BEAER_group1_3(values) as void
-  m.AssertTrue(true)
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests group 2 - should have group before after
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@BeforeEach
-function BEAER_group2_BeforeEach() as void
-  ? "!!! Before GROUP 2"
-end function
-
-
-'@AfterEach
-function BEAER_group2_AfterEach() as void
-    ? "!!! After GROUP 2"
-end function
-
-'@Test 1 
-function BEAER_group2_1() as void
-  m.AssertTrue(true)
-end function
-
-'@Test 2
-function BEAER_group2_2() as void
-  m.AssertTrue(true)
-end function
-
-'@Test 3
-'@Params["a"]
-'@Params["b"]
-'@Params["c"]
-function BEAER_group2_3(values) as void
-  m.AssertTrue(true)
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests group 3 - should have global before/after
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test 1 
-function BEAER_group3_1() as void
-  m.AssertTrue(true)
-end function
-
-'@Test 2
-function BEAER_group3_2() as void
-  m.AssertTrue(true)
-end function
-
-'@Test 3
-'@Params["a"]
-'@Params["b"]
-'@Params["c"]
-function BEAER_group3_3(values) as void
-  m.AssertTrue(true)
-end function
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index eb853107..79cb20a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "rooibos",
-  "version": "3.6.1",
+  "version": "4.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -11,7 +11,7 @@
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "2.0.3",
-        "run-parallel": "1.1.9"
+        "run-parallel": "^1.1.9"
       }
     },
     "@nodelib/fs.stat": {
@@ -27,60 +27,23 @@
       "dev": true,
       "requires": {
         "@nodelib/fs.scandir": "2.1.3",
-        "fastq": "1.6.0"
+        "fastq": "^1.6.0"
       }
     },
-    "@types/events": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
-      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
-      "dev": true
-    },
-    "@types/expect": {
-      "version": "1.20.4",
-      "resolved": "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz",
-      "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==",
+    "@types/color-name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
       "dev": true
     },
     "@types/glob": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
-      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
-      "dev": true,
-      "requires": {
-        "@types/events": "3.0.0",
-        "@types/minimatch": "3.0.3",
-        "@types/node": "13.5.0"
-      }
-    },
-    "@types/glob-stream": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@types/glob-stream/-/glob-stream-6.1.0.tgz",
-      "integrity": "sha512-RHv6ZQjcTncXo3thYZrsbAVwoy4vSKosSWhuhuQxLOTv74OJuFQxXkmUuZCr3q9uNBEVCvIzmZL/FeRNbHZGUg==",
-      "dev": true,
-      "requires": {
-        "@types/glob": "7.1.1",
-        "@types/node": "13.5.0"
-      }
-    },
-    "@types/gulp": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.6.tgz",
-      "integrity": "sha512-0E8/iV/7FKWyQWSmi7jnUvgXXgaw+pfAzEB06Xu+l0iXVJppLbpOye5z7E2klw5akXd+8kPtYuk65YBcZPM4ow==",
-      "dev": true,
-      "requires": {
-        "@types/undertaker": "1.2.2",
-        "@types/vinyl-fs": "2.4.11",
-        "chokidar": "2.1.8"
-      }
-    },
-    "@types/merge2": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@types/merge2/-/merge2-1.3.0.tgz",
-      "integrity": "sha512-3xFWjsGhm5GCVlRrcrrVr9oapPxpbG5M3G/4JGF+Gra++7DWoeDOQphCEhyMpbpbptD3w/4PesYIMby/yHrzkQ==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
       "dev": true,
       "requires": {
-        "@types/node": "13.5.0"
+        "@types/minimatch": "*",
+        "@types/node": "*"
       }
     },
     "@types/minimatch": {
@@ -90,142 +53,122 @@
       "dev": true
     },
     "@types/node": {
-      "version": "13.5.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.5.0.tgz",
-      "integrity": "sha512-Onhn+z72D2O2Pb2ql2xukJ55rglumsVo1H6Fmyi8mlU9SvKdBk/pUSUAiBY/d9bAOF7VVWajX3sths/+g6ZiAQ==",
+      "version": "14.11.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.2.tgz",
+      "integrity": "sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==",
       "dev": true
     },
-    "@types/undertaker": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@types/undertaker/-/undertaker-1.2.2.tgz",
-      "integrity": "sha512-j4iepCSuY2JGW/hShVtUBagic0klYNFIXP7VweavnYnNC2EjiKxJFeaS9uaJmAT0ty9sQSqTS1aagWMZMV0HyA==",
-      "dev": true,
-      "requires": {
-        "@types/undertaker-registry": "1.0.1"
-      }
-    },
-    "@types/undertaker-registry": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-      "integrity": "sha512-Z4TYuEKn9+RbNVk1Ll2SS4x1JeLHecolIbM/a8gveaHsW0Hr+RQMraZACwTO2VD7JvepgA6UO1A1VrbktQrIbQ==",
+    "@types/semver": {
+      "version": "7.3.4",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.4.tgz",
+      "integrity": "sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ==",
       "dev": true
     },
-    "@types/vinyl": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.4.tgz",
-      "integrity": "sha512-2o6a2ixaVI2EbwBPg1QYLGQoHK56p/8X/sGfKbFC8N6sY9lfjsMf/GprtkQkSya0D4uRiutRZ2BWj7k3JvLsAQ==",
-      "dev": true,
-      "requires": {
-        "@types/expect": "1.20.4",
-        "@types/node": "13.5.0"
-      }
-    },
-    "@types/vinyl-fs": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/@types/vinyl-fs/-/vinyl-fs-2.4.11.tgz",
-      "integrity": "sha512-2OzQSfIr9CqqWMGqmcERE6Hnd2KY3eBVtFaulVo3sJghplUcaeMdL9ZjEiljcQQeHjheWY9RlNmumjIAvsBNaA==",
+    "@types/yargs": {
+      "version": "15.0.7",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.7.tgz",
+      "integrity": "sha512-Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA==",
       "dev": true,
       "requires": {
-        "@types/glob-stream": "6.1.0",
-        "@types/node": "13.5.0",
-        "@types/vinyl": "2.0.4"
+        "@types/yargs-parser": "*"
       }
     },
-    "adm-zip": {
-      "version": "0.4.14",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.14.tgz",
-      "integrity": "sha512-/9aQCnQHF+0IiCl0qhXoK7qs//SwYE7zX8lsr/DNk1BRAHYxeLZPL4pguwK29gUEqasYQjqPtEpDRSWEkdHn9g==",
+    "@types/yargs-parser": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
+      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
       "dev": true
     },
-    "ajv": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz",
-      "integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==",
+    "@xml-tools/ast": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@xml-tools/ast/-/ast-5.0.0.tgz",
+      "integrity": "sha512-NLMBbvW1S6bG+pHvPfQeM3ci+le9LexuA4E+obqoRpTWqlJSQGiPKxq8p+HauQmdlF4UC9GUIGsa+9FNFefKyg==",
       "dev": true,
       "requires": {
-        "fast-deep-equal": "3.1.1",
-        "fast-json-stable-stringify": "2.1.0",
-        "json-schema-traverse": "0.4.1",
-        "uri-js": "4.2.2"
+        "@xml-tools/common": "^0.1.2",
+        "@xml-tools/parser": "^1.0.7",
+        "lodash": "4.17.15"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
       }
     },
-    "ansi-colors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+    "@xml-tools/common": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@xml-tools/common/-/common-0.1.2.tgz",
+      "integrity": "sha512-5U0CbB3u5WDRKX+oPjHEm6ZkJk8z5LZMpEI6uzBzcnP+3dIxahCF90lhwljQ/rPVSLMLxLfv72xru6RbePeLWA==",
       "dev": true,
       "requires": {
-        "ansi-wrap": "0.1.0"
+        "lodash": "4.17.15"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "dev": true
+        }
       }
     },
-    "ansi-cyan": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
-      "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
+    "@xml-tools/parser": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@xml-tools/parser/-/parser-1.0.7.tgz",
+      "integrity": "sha512-mdjG4dWj4zaubxWAgr0YMNkZr182aHek5xrpDqgITNnGf+E8FhvAmCU95QiL9+pGjqK8Qfd+qnuer9f8KELRyQ==",
       "dev": true,
       "requires": {
-        "ansi-wrap": "0.1.0"
+        "chevrotain": "7.0.1"
       }
     },
-    "ansi-gray": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
+    "aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
       "dev": true,
       "requires": {
-        "ansi-wrap": "0.1.0"
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
       }
     },
-    "ansi-red": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
-      "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
+    "ajv": {
+      "version": "6.12.5",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz",
+      "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==",
       "dev": true,
       "requires": {
-        "ansi-wrap": "0.1.0"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       }
     },
     "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
       "dev": true
     },
     "ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true
-    },
-    "ansi-wrap": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
-      "dev": true
-    },
-    "any-promise": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
-      "dev": true
-    },
-    "anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "requires": {
-        "micromatch": "3.1.10",
-        "normalize-path": "2.1.1"
+        "color-convert": "^1.9.0"
       }
     },
-    "append-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
-      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
+    "anymatch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
       "dev": true,
       "requires": {
-        "buffer-equal": "1.0.0"
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
       }
     },
     "archiver": {
@@ -234,26 +177,13 @@
       "integrity": "sha512-5Hxxcig7gw5Jod/8Gq0OneVgLYET+oNHcxgWItq4TbhOzRLKNAFUb9edAftiMKXvXfCB0vbGrJdZDNq0dWMsxg==",
       "dev": true,
       "requires": {
-        "archiver-utils": "2.1.0",
-        "async": "2.6.3",
-        "buffer-crc32": "0.2.13",
-        "glob": "7.1.6",
-        "readable-stream": "3.5.0",
-        "tar-stream": "2.1.0",
-        "zip-stream": "2.1.3"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz",
-          "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.4",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
-          }
-        }
+        "archiver-utils": "^2.1.0",
+        "async": "^2.6.3",
+        "buffer-crc32": "^0.2.1",
+        "glob": "^7.1.4",
+        "readable-stream": "^3.4.0",
+        "tar-stream": "^2.1.0",
+        "zip-stream": "^2.1.2"
       }
     },
     "archiver-utils": {
@@ -262,6517 +192,1454 @@
       "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==",
       "dev": true,
       "requires": {
-        "glob": "7.1.6",
-        "graceful-fs": "4.2.3",
-        "lazystream": "1.0.0",
-        "lodash.defaults": "4.2.0",
-        "lodash.difference": "4.5.0",
-        "lodash.flatten": "4.4.0",
-        "lodash.isplainobject": "4.0.6",
-        "lodash.union": "4.6.0",
-        "normalize-path": "3.0.0",
-        "readable-stream": "2.3.7"
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.0",
+        "lazystream": "^1.0.0",
+        "lodash.defaults": "^4.2.0",
+        "lodash.difference": "^4.5.0",
+        "lodash.flatten": "^4.4.0",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.union": "^4.6.0",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^2.0.0"
       },
       "dependencies": {
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
         }
       }
     },
-    "archy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
+    "array-flat-polyfill": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-flat-polyfill/-/array-flat-polyfill-1.0.1.tgz",
+      "integrity": "sha512-hfJmKupmQN0lwi0xG6FQ5U8Rd97RnIERplymOv/qpq8AoNKPPAnxJadjFA23FNWm88wykh9HmpLJUUwUtNU/iw==",
       "dev": true
     },
-    "arg": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.2.tgz",
-      "integrity": "sha512-+ytCkGcBtHZ3V2r2Z06AncYO8jz46UEamcspGoU8lHcEbpn6J77QK0vdWvChsclg/tM5XIJC5tnjmPp7Eq6Obg=="
-    },
-    "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+    "array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true
     },
-    "arr-filter": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
-      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
       "dev": true,
       "requires": {
-        "make-iterator": "1.0.1"
+        "safer-buffer": "~2.1.0"
       }
     },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
       "dev": true
     },
-    "arr-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
+    "async": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
       "dev": true,
       "requires": {
-        "make-iterator": "1.0.1"
+        "lodash": "^4.17.14"
       }
     },
-    "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
       "dev": true
     },
-    "array-back": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
-      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
+    "at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
       "dev": true
     },
-    "array-differ": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
       "dev": true
     },
-    "array-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
+    "aws4": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz",
+      "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==",
       "dev": true
     },
-    "array-flat-polyfill": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-flat-polyfill/-/array-flat-polyfill-1.0.1.tgz",
-      "integrity": "sha512-hfJmKupmQN0lwi0xG6FQ5U8Rd97RnIERplymOv/qpq8AoNKPPAnxJadjFA23FNWm88wykh9HmpLJUUwUtNU/iw==",
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
       "dev": true
     },
-    "array-initial": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
-      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
-      "dev": true,
-      "requires": {
-        "array-slice": "1.1.0",
-        "is-number": "4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
-        }
-      }
+    "base64-js": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
+      "dev": true
     },
-    "array-last": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
       "dev": true,
       "requires": {
-        "is-number": "4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
-        }
+        "tweetnacl": "^0.14.3"
       }
     },
-    "array-slice": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+    "binary-extensions": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
+      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
       "dev": true
     },
-    "array-sort": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
-      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
+    "bl": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
+      "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
       "dev": true,
       "requires": {
-        "default-compare": "1.0.0",
-        "get-value": "2.0.6",
-        "kind-of": "5.1.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
       }
     },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
       "requires": {
-        "array-uniq": "1.0.3"
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
     },
-    "array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true
+    "brighterscript": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/brighterscript/-/brighterscript-0.15.0.tgz",
+      "integrity": "sha512-Tdfdls1JHoT2IXZCo2dqPArOPgCUu12xhxEjXTIDRydXXxfVh22oGQx5OvYJ4II7qk4QzjNVS0rthP1JDSOJiw==",
+      "dev": true,
+      "requires": {
+        "@types/yargs": "^15.0.5",
+        "array-flat-polyfill": "^1.0.1",
+        "chalk": "^2.4.2",
+        "chokidar": "^3.0.2",
+        "clear": "^0.1.0",
+        "cross-platform-clear-console": "^2.3.0",
+        "debounce-promise": "^3.1.0",
+        "eventemitter3": "^4.0.0",
+        "file-url": "^3.0.0",
+        "fs-extra": "^7.0.1",
+        "glob": "^7.1.6",
+        "jsonc-parser": "^2.3.0",
+        "long": "^3.2.0",
+        "luxon": "^1.8.3",
+        "minimatch": "^3.0.4",
+        "moment": "^2.23.0",
+        "p-settle": "^2.1.0",
+        "parse-ms": "^2.1.0",
+        "roku-deploy": "^3.2.3",
+        "serialize-error": "^7.0.1",
+        "source-map": "^0.7.3",
+        "vscode-languageserver": "^6.1.1",
+        "vscode-languageserver-textdocument": "^1.0.1",
+        "vscode-uri": "^2.1.1",
+        "xml2js": "^0.4.19",
+        "yargs": "^15.4.0"
+      }
     },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+    "buffer": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz",
+      "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==",
       "dev": true,
       "requires": {
-        "safer-buffer": "2.1.2"
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4"
       }
     },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
       "dev": true
     },
-    "assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true
     },
-    "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
       "requires": {
-        "lodash": "4.17.15"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       }
     },
-    "async-done": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
-      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
+    "chevrotain": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/chevrotain/-/chevrotain-7.0.1.tgz",
+      "integrity": "sha512-B/44jrdw5GAzy483LEeVSgXSX0qOYM8lUd3l5+yf6Vl6OQjEUCm2BUiYbHRCIK6xCEvCLAFe1kj8uyV6+zdaVw==",
       "dev": true,
       "requires": {
-        "end-of-stream": "1.4.4",
-        "once": "1.4.0",
-        "process-nextick-args": "2.0.1",
-        "stream-exhaust": "1.0.2"
+        "regexp-to-ast": "0.5.0"
       }
     },
-    "async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true
-    },
-    "async-settle": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
-      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
+    "chokidar": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
+      "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
       "dev": true,
       "requires": {
-        "async-done": "1.3.2"
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "fsevents": "~2.1.2",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.4.0"
       }
     },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+    "clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
       "dev": true
     },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+    "clear": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/clear/-/clear-0.1.0.tgz",
+      "integrity": "sha512-qMjRnoL+JDPJHeLePZJuao6+8orzHMGP04A8CdwCNsKhRbOnKRjefxONR7bwILT3MHecxKBjHkKL/tkZ8r4Uzw==",
       "dev": true
     },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
+    "cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
     },
-    "aws4": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
-      "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
-    "babel-cli": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz",
-      "integrity": "sha1-UCq1SHTX24itALiHoGODzgPQAvE=",
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "compress-commons": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-2.1.1.tgz",
+      "integrity": "sha512-eVw6n7CnEMFzc3duyFVrQEuY1BlHR3rYsSztyG32ibGMW722i3C6IizEGMFmfMU+A+fALvBIwxN3czffTcdA+Q==",
       "dev": true,
       "requires": {
-        "babel-core": "6.26.3",
-        "babel-polyfill": "6.26.0",
-        "babel-register": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "chokidar": "1.7.0",
-        "commander": "2.20.3",
-        "convert-source-map": "1.7.0",
-        "fs-readdir-recursive": "1.1.0",
-        "glob": "7.1.6",
-        "lodash": "4.17.15",
-        "output-file-sync": "1.1.2",
-        "path-is-absolute": "1.0.1",
-        "slash": "1.0.0",
-        "source-map": "0.5.7",
-        "v8flags": "2.1.1"
+        "buffer-crc32": "^0.2.13",
+        "crc32-stream": "^3.0.1",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^2.3.6"
       },
       "dependencies": {
-        "anymatch": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-          "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "micromatch": "2.3.11",
-            "normalize-path": "2.1.1"
-          }
-        },
-        "arr-diff": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "arr-flatten": "1.1.0"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           }
-        },
-        "array-unique": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true,
-          "optional": true
-        },
-        "braces": {
-          "version": "1.8.5",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-          "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "expand-range": "1.8.2",
-            "preserve": "0.2.0",
-            "repeat-element": "1.1.3"
-          }
-        },
-        "chokidar": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-          "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "anymatch": "1.3.2",
-            "async-each": "1.0.3",
-            "fsevents": "1.2.11",
-            "glob-parent": "2.0.0",
-            "inherits": "2.0.4",
-            "is-binary-path": "1.0.1",
-            "is-glob": "2.0.1",
-            "path-is-absolute": "1.0.1",
-            "readdirp": "2.2.1"
-          }
-        },
-        "expand-brackets": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-          "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-posix-bracket": "0.1.1"
-          }
-        },
-        "extglob": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-          "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-extglob": "1.0.0"
-          }
-        },
-        "glob-parent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-glob": "2.0.1"
-          }
-        },
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "1.0.0"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-buffer": "1.1.6"
-          }
-        },
-        "micromatch": {
-          "version": "2.3.11",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-          "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "arr-diff": "2.0.0",
-            "array-unique": "0.2.1",
-            "braces": "1.8.5",
-            "expand-brackets": "0.1.5",
-            "extglob": "0.3.2",
-            "filename-regex": "2.0.1",
-            "is-extglob": "1.0.0",
-            "is-glob": "2.0.1",
-            "kind-of": "3.2.2",
-            "normalize-path": "2.1.1",
-            "object.omit": "2.0.1",
-            "parse-glob": "3.0.4",
-            "regex-cache": "0.4.4"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "v8flags": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
-          "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
-          "dev": true,
-          "requires": {
-            "user-home": "1.1.1"
-          }
-        }
-      }
-    },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "esutils": "2.0.3",
-        "js-tokens": "3.0.2"
-      }
-    },
-    "babel-core": {
-      "version": "6.26.3",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
-      "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "6.26.0",
-        "babel-generator": "6.26.1",
-        "babel-helpers": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-register": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "convert-source-map": "1.7.0",
-        "debug": "2.6.9",
-        "json5": "0.5.1",
-        "lodash": "4.17.15",
-        "minimatch": "3.0.4",
-        "path-is-absolute": "1.0.1",
-        "private": "0.1.8",
-        "slash": "1.0.0",
-        "source-map": "0.5.7"
-      },
-      "dependencies": {
-        "babylon": {
-          "version": "6.18.0",
-          "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "babel-generator": {
-      "version": "6.26.1",
-      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
-      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
-      "dev": true,
-      "requires": {
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "detect-indent": "4.0.0",
-        "jsesc": "1.3.0",
-        "lodash": "4.17.15",
-        "source-map": "0.5.7",
-        "trim-right": "1.0.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "babel-helpers": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
-      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
-      }
-    },
-    "babel-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0"
-      }
-    },
-    "babel-polyfill": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
-      "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "core-js": "2.6.11",
-        "regenerator-runtime": "0.10.5"
-      },
-      "dependencies": {
-        "regenerator-runtime": {
-          "version": "0.10.5",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
-          "dev": true
-        }
-      }
-    },
-    "babel-register": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
-      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
-      "dev": true,
-      "requires": {
-        "babel-core": "6.26.3",
-        "babel-runtime": "6.26.0",
-        "core-js": "2.6.11",
-        "home-or-tmp": "2.0.0",
-        "lodash": "4.17.15",
-        "mkdirp": "0.5.1",
-        "source-map-support": "0.4.18"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "source-map-support": {
-          "version": "0.4.18",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-          "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
-          "dev": true,
-          "requires": {
-            "source-map": "0.5.7"
-          }
-        }
-      }
-    },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
-      "requires": {
-        "core-js": "2.6.11",
-        "regenerator-runtime": "0.11.1"
-      }
-    },
-    "babel-template": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "lodash": "4.17.15"
-      },
-      "dependencies": {
-        "babylon": {
-          "version": "6.18.0",
-          "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-          "dev": true
-        }
-      }
-    },
-    "babel-traverse": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "6.26.0",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "debug": "2.6.9",
-        "globals": "9.18.0",
-        "invariant": "2.2.4",
-        "lodash": "4.17.15"
-      },
-      "dependencies": {
-        "babylon": {
-          "version": "6.18.0",
-          "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-          "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-          "dev": true
-        }
-      }
-    },
-    "babel-types": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "esutils": "2.0.3",
-        "lodash": "4.17.15",
-        "to-fast-properties": "1.0.3"
-      }
-    },
-    "babylon": {
-      "version": "7.0.0-beta.19",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz",
-      "integrity": "sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A==",
-      "dev": true
-    },
-    "bach": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
-      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
-      "dev": true,
-      "requires": {
-        "arr-filter": "1.1.2",
-        "arr-flatten": "1.1.0",
-        "arr-map": "2.0.2",
-        "array-each": "1.0.1",
-        "array-initial": "1.1.0",
-        "array-last": "1.3.0",
-        "async-done": "1.3.2",
-        "async-settle": "1.0.0",
-        "now-and-later": "2.0.1"
-      }
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-    },
-    "base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "requires": {
-        "cache-base": "1.0.1",
-        "class-utils": "0.3.6",
-        "component-emitter": "1.3.0",
-        "define-property": "1.0.0",
-        "isobject": "3.0.1",
-        "mixin-deep": "1.3.2",
-        "pascalcase": "0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "1.0.2"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "6.0.3"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "6.0.3"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.3"
-          }
-        }
-      }
-    },
-    "base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
-      "dev": true
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
-      "requires": {
-        "tweetnacl": "0.14.5"
-      }
-    },
-    "beeper": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
-      "dev": true
-    },
-    "binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true
-    },
-    "bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "bl": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-3.0.0.tgz",
-      "integrity": "sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==",
-      "dev": true,
-      "requires": {
-        "readable-stream": "3.5.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz",
-          "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.4",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
-          }
-        }
-      }
-    },
-    "bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
-        "balanced-match": "1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "requires": {
-        "arr-flatten": "1.1.0",
-        "array-unique": "0.3.2",
-        "extend-shallow": "2.0.1",
-        "fill-range": "4.0.0",
-        "isobject": "3.0.1",
-        "repeat-element": "1.1.3",
-        "snapdragon": "0.8.2",
-        "snapdragon-node": "2.1.1",
-        "split-string": "3.1.0",
-        "to-regex": "3.0.2"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "0.1.1"
-          }
-        }
-      }
-    },
-    "brighterscript": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/brighterscript/-/brighterscript-0.10.0.tgz",
-      "integrity": "sha512-7l6zxVmnJ1yvRHzzkjg5X4/hwoDs3FX2kfWwuoCMEr0N8d11fiSxfcthym8AyKSPibESWlpR+awHcAlq472+lw==",
-      "dev": true,
-      "requires": {
-        "array-flat-polyfill": "1.0.1",
-        "chalk": "2.4.2",
-        "chokidar": "3.4.0",
-        "clear": "0.1.0",
-        "command-line-args": "5.1.1",
-        "command-line-usage": "5.0.5",
-        "cross-platform-clear-console": "2.3.0",
-        "debounce-promise": "3.1.2",
-        "eventemitter3": "4.0.4",
-        "fs-extra": "7.0.1",
-        "glob": "7.1.6",
-        "jsonc-parser": "2.2.1",
-        "long": "3.2.0",
-        "luxon": "1.21.3",
-        "minimatch": "3.0.4",
-        "moment": "2.24.0",
-        "p-settle": "2.1.0",
-        "roku-deploy": "3.1.1",
-        "source-map": "0.7.3",
-        "vscode-languageserver": "6.1.1",
-        "vscode-languageserver-textdocument": "1.0.1",
-        "vscode-uri": "2.1.1",
-        "xml2js": "0.4.23"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "1.9.3"
-          }
-        },
-        "anymatch": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-          "dev": true,
-          "requires": {
-            "normalize-path": "3.0.0",
-            "picomatch": "2.2.1"
-          }
-        },
-        "binary-extensions": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
-          "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
-          "dev": true
-        },
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "7.0.1"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.5.0"
-          }
-        },
-        "chokidar": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
-          "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
-          "dev": true,
-          "requires": {
-            "anymatch": "3.1.1",
-            "braces": "3.0.2",
-            "fsevents": "2.1.3",
-            "glob-parent": "5.1.1",
-            "is-binary-path": "2.1.0",
-            "is-glob": "4.0.1",
-            "normalize-path": "3.0.0",
-            "readdirp": "3.4.0"
-          }
-        },
-        "dateformat": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-          "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
-          "dev": true
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "5.0.1"
-          }
-        },
-        "fs-extra": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.2.3",
-            "jsonfile": "4.0.0",
-            "universalify": "0.1.2"
-          }
-        },
-        "fsevents": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-          "dev": true,
-          "optional": true
-        },
-        "glob-parent": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-          "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-          "dev": true,
-          "requires": {
-            "is-glob": "4.0.1"
-          }
-        },
-        "is-binary-path": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-          "dev": true,
-          "requires": {
-            "binary-extensions": "2.0.0"
-          }
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
-        },
-        "readdirp": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-          "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
-          "dev": true,
-          "requires": {
-            "picomatch": "2.2.1"
-          }
-        },
-        "roku-deploy": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/roku-deploy/-/roku-deploy-3.1.1.tgz",
-          "integrity": "sha512-mdcnlC4T4NlA/BW1FJ9VV1UGt5OF87F8efieso2BZNQ/LO7LgzWA8dPS69hmtout1aMbXvkSy1ksEiDdJOKiIQ==",
-          "dev": true,
-          "requires": {
-            "archiver": "3.1.1",
-            "dateformat": "3.0.3",
-            "fs-extra": "7.0.1",
-            "glob": "7.1.6",
-            "minimatch": "3.0.4",
-            "path": "0.12.7",
-            "request": "2.88.0"
-          }
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "3.0.0"
-          }
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "7.0.0"
-          }
-        },
-        "vscode-jsonrpc": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
-          "integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==",
-          "dev": true
-        },
-        "vscode-languageserver": {
-          "version": "6.1.1",
-          "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz",
-          "integrity": "sha512-DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ==",
-          "dev": true,
-          "requires": {
-            "vscode-languageserver-protocol": "3.15.3"
-          }
-        },
-        "vscode-languageserver-protocol": {
-          "version": "3.15.3",
-          "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz",
-          "integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==",
-          "dev": true,
-          "requires": {
-            "vscode-jsonrpc": "5.0.1",
-            "vscode-languageserver-types": "3.15.1"
-          }
-        },
-        "vscode-languageserver-types": {
-          "version": "3.15.1",
-          "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
-          "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==",
-          "dev": true
-        },
-        "vscode-uri": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.1.tgz",
-          "integrity": "sha512-eY9jmGoEnVf8VE8xr5znSah7Qt1P/xsCdErz+g8HYZtJ7bZqKH5E3d+6oVNm1AC/c6IHUDokbmVXKOi4qPAC9A==",
-          "dev": true
-        }
-      }
-    },
-    "brightscript-language": {
-      "version": "0.2.15",
-      "resolved": "https://registry.npmjs.org/brightscript-language/-/brightscript-language-0.2.15.tgz",
-      "integrity": "sha512-uqDnMXjgXMC4sfqeWhOV4VWKn5DPkUPLNl0osNMuD7A5Q90oHMpVbeyPU5ykvCUD7YBNhNXBoqsR9frSSNVjsA==",
-      "dev": true,
-      "requires": {
-        "brs": "0.14.0-nightly.20190613",
-        "chalk": "2.4.2",
-        "chokidar": "2.1.8",
-        "clear": "0.1.0",
-        "command-line-args": "5.1.1",
-        "command-line-usage": "5.0.5",
-        "cross-platform-clear-console": "2.3.0",
-        "debounce-promise": "3.1.2",
-        "fs-extra": "7.0.1",
-        "moment": "2.24.0",
-        "roku-deploy": "2.6.1",
-        "vscode-languageserver": "5.2.1",
-        "vscode-uri": "1.0.8",
-        "xml2js": "0.4.23"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "1.9.3"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.5.0"
-          }
-        },
-        "fs-extra": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.2.3",
-            "jsonfile": "4.0.0",
-            "universalify": "0.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "3.0.0"
-          }
-        }
-      }
-    },
-    "brs": {
-      "version": "0.14.0-nightly.20190613",
-      "resolved": "https://registry.npmjs.org/brs/-/brs-0.14.0-nightly.20190613.tgz",
-      "integrity": "sha512-+CQq7frjIBzWL7dpyQqCc502nGvORhjhWtXk37SSvVdtt6P7jzhw6EDb6Q9qwj5QppzLRp7o5wVb3WB7rYbqLg==",
-      "dev": true,
-      "requires": {
-        "commander": "2.20.3",
-        "long": "3.2.0",
-        "luxon": "1.21.3",
-        "memory-fs": "0.4.1",
-        "nanomatch": "1.2.13",
-        "p-settle": "2.1.0"
-      }
-    },
-    "buffer": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.3.tgz",
-      "integrity": "sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==",
-      "dev": true,
-      "requires": {
-        "base64-js": "1.3.1",
-        "ieee754": "1.1.13"
-      }
-    },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
-    },
-    "buffer-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
-      "dev": true
-    },
-    "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
-    },
-    "cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
-      "requires": {
-        "collection-visit": "1.0.0",
-        "component-emitter": "1.3.0",
-        "get-value": "2.0.6",
-        "has-value": "1.0.0",
-        "isobject": "3.0.1",
-        "set-value": "2.0.1",
-        "to-object-path": "0.3.0",
-        "union-value": "1.0.1",
-        "unset-value": "1.0.0"
-      }
-    },
-    "camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-      "dev": true
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
-    },
-    "catharsis": {
-      "version": "0.8.11",
-      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.11.tgz",
-      "integrity": "sha512-a+xUyMV7hD1BrDQA/3iPV7oc+6W26BgVJO05PGEoatMyIuPScQKsde6i3YorWX1qs+AZjnJ18NqdKoCtKiNh1g==",
-      "dev": true,
-      "requires": {
-        "lodash": "4.17.15"
-      }
-    },
-    "chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "2.2.1",
-        "escape-string-regexp": "1.0.5",
-        "has-ansi": "2.0.0",
-        "strip-ansi": "3.0.1",
-        "supports-color": "2.0.0"
-      }
-    },
-    "chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "dev": true,
-      "requires": {
-        "anymatch": "2.0.0",
-        "async-each": "1.0.3",
-        "braces": "2.3.2",
-        "fsevents": "1.2.11",
-        "glob-parent": "3.1.0",
-        "inherits": "2.0.4",
-        "is-binary-path": "1.0.1",
-        "is-glob": "4.0.1",
-        "normalize-path": "3.0.0",
-        "path-is-absolute": "1.0.1",
-        "readdirp": "2.2.1",
-        "upath": "1.2.0"
-      },
-      "dependencies": {
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
-        }
-      }
-    },
-    "class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "3.1.0",
-        "define-property": "0.2.5",
-        "isobject": "3.0.1",
-        "static-extend": "0.1.2"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "0.1.6"
-          }
-        }
-      }
-    },
-    "clear": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/clear/-/clear-0.1.0.tgz",
-      "integrity": "sha512-qMjRnoL+JDPJHeLePZJuao6+8orzHMGP04A8CdwCNsKhRbOnKRjefxONR7bwILT3MHecxKBjHkKL/tkZ8r4Uzw==",
-      "dev": true
-    },
-    "cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "dev": true,
-      "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wrap-ansi": "2.1.0"
-      }
-    },
-    "clone": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
-      "dev": true
-    },
-    "clone-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-      "dev": true
-    },
-    "clone-stats": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-      "dev": true
-    },
-    "cloneable-readable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.4",
-        "process-nextick-args": "2.0.1",
-        "readable-stream": "2.3.7"
-      }
-    },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
-    },
-    "collection-map": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
-      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
-      "dev": true,
-      "requires": {
-        "arr-map": "2.0.2",
-        "for-own": "1.0.0",
-        "make-iterator": "1.0.1"
-      }
-    },
-    "collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dev": true,
-      "requires": {
-        "map-visit": "1.0.0",
-        "object-visit": "1.0.1"
-      }
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "dev": true
-    },
-    "colors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-      "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
-      "dev": true
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "requires": {
-        "delayed-stream": "1.0.0"
-      }
-    },
-    "command-line-args": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz",
-      "integrity": "sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==",
-      "dev": true,
-      "requires": {
-        "array-back": "3.1.0",
-        "find-replace": "3.0.0",
-        "lodash.camelcase": "4.3.0",
-        "typical": "4.0.0"
-      }
-    },
-    "command-line-usage": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-5.0.5.tgz",
-      "integrity": "sha512-d8NrGylA5oCXSbGoKz05FkehDAzSmIm4K03S5VDh4d5lZAtTWfc3D1RuETtuQCn8129nYfJfDdF7P/lwcz1BlA==",
-      "dev": true,
-      "requires": {
-        "array-back": "2.0.0",
-        "chalk": "2.4.2",
-        "table-layout": "0.4.5",
-        "typical": "2.6.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "1.9.3"
-          }
-        },
-        "array-back": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz",
-          "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==",
-          "dev": true,
-          "requires": {
-            "typical": "2.6.1"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.5.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "3.0.0"
-          }
-        },
-        "typical": {
-          "version": "2.6.1",
-          "resolved": "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz",
-          "integrity": "sha1-XAgOXWYcu+OCWdLnCjxyU+hziB0=",
-          "dev": true
-        }
-      }
-    },
-    "commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "compare-directories": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/compare-directories/-/compare-directories-0.1.0.tgz",
-      "integrity": "sha1-6Si7Oj42mC4KhK7oSqHHj1vbh0w=",
-      "dev": true,
-      "requires": {
-        "fs-promise": "2.0.3",
-        "recursive-readdir": "2.2.2"
-      }
-    },
-    "component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "dev": true
-    },
-    "compress-commons": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-2.1.1.tgz",
-      "integrity": "sha512-eVw6n7CnEMFzc3duyFVrQEuY1BlHR3rYsSztyG32ibGMW722i3C6IizEGMFmfMU+A+fALvBIwxN3czffTcdA+Q==",
-      "dev": true,
-      "requires": {
-        "buffer-crc32": "0.2.13",
-        "crc32-stream": "3.0.1",
-        "normalize-path": "3.0.0",
-        "readable-stream": "2.3.7"
-      },
-      "dependencies": {
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
-        }
-      }
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "1.1.1",
-        "inherits": "2.0.4",
-        "readable-stream": "2.3.7",
-        "typedarray": "0.0.6"
-      }
-    },
-    "concat-with-sourcemaps": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
-      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
-      "requires": {
-        "source-map": "0.6.1"
-      }
-    },
-    "convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.2"
-      }
-    },
-    "copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true
-    },
-    "copy-props": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
-      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
-      "dev": true,
-      "requires": {
-        "each-props": "1.3.2",
-        "is-plain-object": "2.0.4"
-      }
-    },
-    "core-js": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==",
-      "dev": true
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "crc": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz",
-      "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==",
-      "dev": true,
-      "requires": {
-        "buffer": "5.4.3"
-      }
-    },
-    "crc32-stream": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-3.0.1.tgz",
-      "integrity": "sha512-mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w==",
-      "dev": true,
-      "requires": {
-        "crc": "3.8.0",
-        "readable-stream": "3.5.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz",
-          "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.4",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
-          }
-        }
-      }
-    },
-    "cross-platform-clear-console": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cross-platform-clear-console/-/cross-platform-clear-console-2.3.0.tgz",
-      "integrity": "sha512-To+sJ6plHHC6k5DfdvSVn6F1GRGJh/R6p76bCpLbyMyHEmbqFyuMAeGwDcz/nGDWH3HUcjFTTX9iUSCzCg9Eiw==",
-      "dev": true
-    },
-    "d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "dev": true,
-      "requires": {
-        "es5-ext": "0.10.53",
-        "type": "1.2.0"
-      }
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0"
-      }
-    },
-    "dateformat": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
-      "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
-      "dev": true
-    },
-    "debounce-promise": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/debounce-promise/-/debounce-promise-3.1.2.tgz",
-      "integrity": "sha512-rZHcgBkbYavBeD9ej6sP56XfG53d51CD4dnaw989YX/nZ/ZJfgRx/9ePKmTNiUiyQvh4mtrMoS3OAWW+yoYtpg==",
-      "dev": true
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
-    },
-    "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true
-    },
-    "deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true
-    },
-    "default-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
-      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "5.1.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
-      }
-    },
-    "default-resolution": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
-      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
-      "dev": true
-    },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "requires": {
-        "object-keys": "1.1.1"
-      }
-    },
-    "define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "requires": {
-        "is-descriptor": "1.0.2",
-        "isobject": "3.0.1"
-      },
-      "dependencies": {
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "6.0.3"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "6.0.3"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.3"
-          }
-        }
-      }
-    },
-    "del": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
-      "dev": true,
-      "requires": {
-        "globby": "6.1.0",
-        "is-path-cwd": "1.0.0",
-        "is-path-in-cwd": "1.0.1",
-        "p-map": "1.2.0",
-        "pify": "3.0.0",
-        "rimraf": "2.7.1"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "7.1.6"
-          }
-        }
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
-    },
-    "detect-file": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-      "dev": true
-    },
-    "detect-indent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
-      "dev": true,
-      "requires": {
-        "repeating": "2.0.1"
-      }
-    },
-    "diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
-    },
-    "dir-compare": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-1.8.0.tgz",
-      "integrity": "sha512-Ork/J37pKE6M+Fvl98OB+iAuZ5CG7d2d8DIMmiCDEZVAbEWn2lp+ghSbc1lgkgVX91p8jMQs2DeTMJvpMeU9+A==",
-      "dev": true,
-      "requires": {
-        "bluebird": "3.4.1",
-        "buffer-equal": "1.0.0",
-        "colors": "1.0.3",
-        "commander": "2.9.0",
-        "minimatch": "3.0.2"
-      },
-      "dependencies": {
-        "bluebird": {
-          "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.1.tgz",
-          "integrity": "sha1-tzHd9I4t077awudeEhWhG8uR+gc=",
-          "dev": true
-        },
-        "commander": {
-          "version": "2.9.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-          "dev": true,
-          "requires": {
-            "graceful-readlink": "1.0.1"
-          }
-        },
-        "minimatch": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz",
-          "integrity": "sha1-DzmKcwDqRB6cNIyD2Yq4ydv5xAo=",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "1.1.11"
-          }
-        }
-      }
-    },
-    "docdash": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/docdash/-/docdash-0.4.0.tgz",
-      "integrity": "sha1-BcOlDYMYmYFpnuDAdtOjlQ237AA=",
-      "dev": true
-    },
-    "dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "2.0.1",
-        "entities": "2.0.0"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
-          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
-          "dev": true
-        },
-        "entities": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
-          "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
-          "dev": true
-        }
-      }
-    },
-    "domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true
-    },
-    "domhandler": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "1.3.1"
-      }
-    },
-    "domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dev": true,
-      "requires": {
-        "dom-serializer": "0.2.2",
-        "domelementtype": "1.3.1"
-      }
-    },
-    "dotenv": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
-      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
-      "dev": true
-    },
-    "duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "1.1.14"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.4",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
-    "duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "1.4.4",
-        "inherits": "2.0.4",
-        "readable-stream": "2.3.7",
-        "stream-shift": "1.0.1"
-      }
-    },
-    "each-props": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
-      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
-      "dev": true,
-      "requires": {
-        "is-plain-object": "2.0.4",
-        "object.defaults": "1.1.0"
-      }
-    },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dev": true,
-      "requires": {
-        "jsbn": "0.1.1",
-        "safer-buffer": "2.1.2"
-      }
-    },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "requires": {
-        "once": "1.4.0"
-      }
-    },
-    "entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true
-    },
-    "errno": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
-      "dev": true,
-      "requires": {
-        "prr": "1.0.1"
-      }
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "0.2.1"
-      }
-    },
-    "es2015": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/es2015/-/es2015-0.0.0.tgz",
-      "integrity": "sha1-hO7kw1yCd2WLaOfkY42zB0GCKxQ=",
-      "dev": true
-    },
-    "es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
-      "dev": true,
-      "requires": {
-        "es6-iterator": "2.0.3",
-        "es6-symbol": "3.1.3",
-        "next-tick": "1.0.0"
-      }
-    },
-    "es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.1",
-        "es5-ext": "0.10.53",
-        "es6-symbol": "3.1.3"
-      }
-    },
-    "es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "dev": true,
-      "requires": {
-        "d": "1.0.1",
-        "ext": "1.4.0"
-      }
-    },
-    "es6-weak-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-      "dev": true,
-      "requires": {
-        "d": "1.0.1",
-        "es5-ext": "0.10.53",
-        "es6-iterator": "2.0.3",
-        "es6-symbol": "3.1.3"
-      }
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "eventemitter3": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
-      "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
-      "dev": true
-    },
-    "expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "define-property": "0.2.5",
-        "extend-shallow": "2.0.1",
-        "posix-character-classes": "0.1.1",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "0.1.6"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "0.1.1"
-          }
-        }
-      }
-    },
-    "expand-range": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "fill-range": "2.2.4"
-      },
-      "dependencies": {
-        "fill-range": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-number": "2.1.0",
-            "isobject": "2.1.0",
-            "randomatic": "3.1.1",
-            "repeat-element": "1.1.3",
-            "repeat-string": "1.6.1"
-          }
-        },
-        "is-number": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-          "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "kind-of": "3.2.2"
-          }
-        },
-        "isobject": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-          "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "isarray": "1.0.0"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-buffer": "1.1.6"
-          }
-        }
-      }
-    },
-    "expand-tilde": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-      "dev": true,
-      "requires": {
-        "homedir-polyfill": "1.0.3"
-      }
-    },
-    "ext": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
-      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
-      "dev": true,
-      "requires": {
-        "type": "2.0.0"
-      },
-      "dependencies": {
-        "type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
-          "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==",
-          "dev": true
-        }
-      }
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "requires": {
-        "assign-symbols": "1.0.0",
-        "is-extendable": "1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "2.0.4"
-          }
-        }
-      }
-    },
-    "extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "requires": {
-        "array-unique": "0.3.2",
-        "define-property": "1.0.0",
-        "expand-brackets": "2.1.4",
-        "extend-shallow": "2.0.1",
-        "fragment-cache": "0.2.1",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "1.0.2"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "0.1.1"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "6.0.3"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "6.0.3"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.3"
-          }
-        }
-      }
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
-    },
-    "fancy-log": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
-      "dev": true,
-      "requires": {
-        "ansi-gray": "0.1.1",
-        "color-support": "1.1.3",
-        "parse-node-version": "1.0.1",
-        "time-stamp": "1.1.0"
-      }
-    },
-    "fast-deep-equal": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
-      "dev": true
-    },
-    "fast-glob": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.1.tgz",
-      "integrity": "sha512-nTCREpBY8w8r+boyFYAx21iL6faSsQynliPHM4Uf56SbkyohCNxpVPEH9xrF5TXKy+IsjkPUHDKiUkzBVRXn9g==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "2.0.3",
-        "@nodelib/fs.walk": "1.2.4",
-        "glob-parent": "5.1.0",
-        "merge2": "1.3.0",
-        "micromatch": "4.0.2"
-      },
-      "dependencies": {
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "7.0.1"
-          }
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "5.0.1"
-          }
-        },
-        "glob-parent": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
-          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
-          "dev": true,
-          "requires": {
-            "is-glob": "4.0.1"
-          }
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-          "dev": true,
-          "requires": {
-            "braces": "3.0.2",
-            "picomatch": "2.2.1"
-          }
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "7.0.0"
-          }
-        }
-      }
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "fastq": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz",
-      "integrity": "sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==",
-      "dev": true,
-      "requires": {
-        "reusify": "1.0.4"
-      }
-    },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true,
-      "optional": true
-    },
-    "filename-regex": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-      "dev": true,
-      "optional": true
-    },
-    "fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "2.0.1",
-        "is-number": "3.0.0",
-        "repeat-string": "1.6.1",
-        "to-regex-range": "2.1.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "0.1.1"
-          }
-        }
-      }
-    },
-    "find-replace": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz",
-      "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==",
-      "dev": true,
-      "requires": {
-        "array-back": "3.1.0"
-      }
-    },
-    "find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "dev": true,
-      "requires": {
-        "path-exists": "2.1.0",
-        "pinkie-promise": "2.0.1"
-      }
-    },
-    "findup-sync": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
-      "dev": true,
-      "requires": {
-        "detect-file": "1.0.0",
-        "is-glob": "4.0.1",
-        "micromatch": "3.1.10",
-        "resolve-dir": "1.0.1"
-      }
-    },
-    "fined": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "2.0.2",
-        "is-plain-object": "2.0.4",
-        "object.defaults": "1.1.0",
-        "object.pick": "1.3.0",
-        "parse-filepath": "1.0.2"
-      }
-    },
-    "flagged-respawn": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
-      "dev": true
-    },
-    "flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.4",
-        "readable-stream": "2.3.7"
-      }
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
-    },
-    "for-own": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-      "dev": true,
-      "requires": {
-        "for-in": "1.0.2"
-      }
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
-    },
-    "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
-      "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.8",
-        "mime-types": "2.1.26"
-      }
-    },
-    "fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "dev": true,
-      "requires": {
-        "map-cache": "0.2.2"
-      }
-    },
-    "fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true
-    },
-    "fs-extra": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.2.3",
-        "jsonfile": "4.0.0",
-        "universalify": "0.1.2"
-      }
-    },
-    "fs-mkdirp-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
-      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.2.3",
-        "through2": "2.0.5"
-      }
-    },
-    "fs-promise": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/fs-promise/-/fs-promise-2.0.3.tgz",
-      "integrity": "sha1-9k5PhUvPaJqovdy6JokW2z20aFQ=",
-      "dev": true,
-      "requires": {
-        "any-promise": "1.3.0",
-        "fs-extra": "2.1.2",
-        "mz": "2.7.0",
-        "thenify-all": "1.6.0"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz",
-          "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.2.3",
-            "jsonfile": "2.4.0"
-          }
-        },
-        "jsonfile": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.2.3"
-          }
-        }
-      }
-    },
-    "fs-readdir-recursive": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
-      "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==",
-      "dev": true
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "fsevents": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz",
-      "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "bindings": "1.5.0",
-        "nan": "2.14.0",
-        "node-pre-gyp": "0.14.0"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "aproba": {
-          "version": "1.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.3.6"
-          }
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "balanced-match": "1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "chownr": {
-          "version": "1.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "debug": {
-          "version": "3.2.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "deep-extend": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "detect-libc": {
-          "version": "1.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "fs-minipass": {
-          "version": "1.2.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "2.9.0"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aproba": "1.2.0",
-            "console-control-strings": "1.1.0",
-            "has-unicode": "2.0.1",
-            "object-assign": "4.1.1",
-            "signal-exit": "3.0.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wide-align": "1.1.3"
-          }
-        },
-        "glob": {
-          "version": "7.1.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.4",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "iconv-lite": {
-          "version": "0.4.24",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safer-buffer": "2.1.2"
-          }
-        },
-        "ignore-walk": {
-          "version": "3.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimatch": "3.0.4"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.4",
-          "bundled": true,
-          "dev": true
-        },
-        "ini": {
-          "version": "1.3.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "number-is-nan": "1.0.1"
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "brace-expansion": "1.1.11"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true
-        },
-        "minipass": {
-          "version": "2.9.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.2",
-            "yallist": "3.1.1"
-          }
-        },
-        "minizlib": {
-          "version": "1.3.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "2.9.0"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "needle": {
-          "version": "2.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "3.2.6",
-            "iconv-lite": "0.4.24",
-            "sax": "1.2.4"
-          }
-        },
-        "node-pre-gyp": {
-          "version": "0.14.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "detect-libc": "1.0.3",
-            "mkdirp": "0.5.1",
-            "needle": "2.4.0",
-            "nopt": "4.0.1",
-            "npm-packlist": "1.4.7",
-            "npmlog": "4.1.2",
-            "rc": "1.2.8",
-            "rimraf": "2.7.1",
-            "semver": "5.7.1",
-            "tar": "4.4.13"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1.1.1",
-            "osenv": "0.1.5"
-          }
-        },
-        "npm-bundled": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "npm-normalize-package-bin": "1.0.1"
-          }
-        },
-        "npm-normalize-package-bin": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "npm-packlist": {
-          "version": "1.4.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ignore-walk": "3.0.3",
-            "npm-bundled": "1.1.1"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "are-we-there-yet": "1.1.5",
-            "console-control-strings": "1.1.0",
-            "gauge": "2.7.4",
-            "set-blocking": "2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "wrappy": "1.0.2"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "0.6.0",
-            "ini": "1.3.5",
-            "minimist": "1.2.0",
-            "strip-json-comments": "2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.4",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.1",
-            "safe-buffer": "5.1.2",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "glob": "7.1.6"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "bundled": true,
-          "dev": true
-        },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "sax": {
-          "version": "1.2.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "5.1.2"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "ansi-regex": "2.1.1"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "4.4.13",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chownr": "1.1.3",
-            "fs-minipass": "1.2.7",
-            "minipass": "2.9.0",
-            "minizlib": "1.3.3",
-            "mkdirp": "0.5.1",
-            "safe-buffer": "5.1.2",
-            "yallist": "3.1.1"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "wide-align": {
-          "version": "1.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "string-width": "1.0.2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "bundled": true,
-          "dev": true
-        }
-      }
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "generate-changelog": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/generate-changelog/-/generate-changelog-1.8.0.tgz",
-      "integrity": "sha512-msgpxeB75Ziyg3wGsZuPNl7c5RxChMKmYcAX5obnhUow90dBZW3nLic6nxGtst7Bpx453oS6zAIHcX7F3QVasw==",
-      "dev": true,
-      "requires": {
-        "bluebird": "3.7.2",
-        "commander": "2.20.3",
-        "github-url-from-git": "1.5.0"
-      }
-    },
-    "get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-      "dev": true
-    },
-    "get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0"
-      }
-    },
-    "github-url-from-git": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.5.0.tgz",
-      "integrity": "sha1-+YX+3MCpqledyI16/waNVcxiUaA=",
-      "dev": true
-    },
-    "glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "requires": {
-        "fs.realpath": "1.0.0",
-        "inflight": "1.0.6",
-        "inherits": "2.0.4",
-        "minimatch": "3.0.4",
-        "once": "1.4.0",
-        "path-is-absolute": "1.0.1"
-      }
-    },
-    "glob-all": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-all/-/glob-all-3.1.0.tgz",
-      "integrity": "sha1-iRPd+17hrHgSZWJBsD1SF8ZLAqs=",
-      "dev": true,
-      "requires": {
-        "glob": "7.1.6",
-        "yargs": "1.2.6"
-      }
-    },
-    "glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "glob-parent": "2.0.0",
-        "is-glob": "2.0.1"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-glob": "2.0.1"
-          }
-        },
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "1.0.0"
-          }
-        }
-      }
-    },
-    "glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dev": true,
-      "requires": {
-        "is-glob": "3.1.0",
-        "path-dirname": "1.0.2"
-      },
-      "dependencies": {
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "2.1.1"
-          }
-        }
-      }
-    },
-    "glob-stream": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
-      "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
-      "dev": true,
-      "requires": {
-        "extend": "3.0.2",
-        "glob": "7.1.6",
-        "glob-parent": "3.1.0",
-        "is-negated-glob": "1.0.0",
-        "ordered-read-streams": "1.0.1",
-        "pumpify": "1.5.1",
-        "readable-stream": "2.3.7",
-        "remove-trailing-separator": "1.1.0",
-        "to-absolute-glob": "2.0.2",
-        "unique-stream": "2.3.1"
-      }
-    },
-    "glob-watcher": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz",
-      "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==",
-      "dev": true,
-      "requires": {
-        "anymatch": "2.0.0",
-        "async-done": "1.3.2",
-        "chokidar": "2.1.8",
-        "is-negated-glob": "1.0.0",
-        "just-debounce": "1.0.0",
-        "object.defaults": "1.1.0"
-      }
-    },
-    "global-modules": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-      "dev": true,
-      "requires": {
-        "global-prefix": "1.0.2",
-        "is-windows": "1.0.2",
-        "resolve-dir": "1.0.1"
-      }
-    },
-    "global-prefix": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "2.0.2",
-        "homedir-polyfill": "1.0.3",
-        "ini": "1.3.5",
-        "is-windows": "1.0.2",
-        "which": "1.3.1"
-      }
-    },
-    "globals": {
-      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-      "dev": true
-    },
-    "globby": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-      "dev": true,
-      "requires": {
-        "array-union": "1.0.2",
-        "glob": "7.1.6",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        }
-      }
-    },
-    "glogg": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
-      "dev": true,
-      "requires": {
-        "sparkles": "1.0.1"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
-      "dev": true
-    },
-    "graceful-readlink": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true
-    },
-    "gulp": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
-      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
-      "dev": true,
-      "requires": {
-        "glob-watcher": "5.0.3",
-        "gulp-cli": "2.2.0",
-        "undertaker": "1.2.1",
-        "vinyl-fs": "3.0.3"
-      },
-      "dependencies": {
-        "gulp-cli": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.2.0.tgz",
-          "integrity": "sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==",
-          "dev": true,
-          "requires": {
-            "ansi-colors": "1.1.0",
-            "archy": "1.0.0",
-            "array-sort": "1.0.0",
-            "color-support": "1.1.3",
-            "concat-stream": "1.6.2",
-            "copy-props": "2.0.4",
-            "fancy-log": "1.3.3",
-            "gulplog": "1.0.0",
-            "interpret": "1.2.0",
-            "isobject": "3.0.1",
-            "liftoff": "3.1.0",
-            "matchdep": "2.0.0",
-            "mute-stdout": "1.0.1",
-            "pretty-hrtime": "1.0.3",
-            "replace-homedir": "1.0.0",
-            "semver-greatest-satisfied-range": "1.1.0",
-            "v8flags": "3.1.3",
-            "yargs": "7.1.0"
-          }
-        },
-        "yargs": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-          "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
-          "dev": true,
-          "requires": {
-            "camelcase": "3.0.0",
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "get-caller-file": "1.0.3",
-            "os-locale": "1.4.0",
-            "read-pkg-up": "1.0.1",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "1.0.2",
-            "which-module": "1.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "5.0.0"
-          }
-        }
-      }
-    },
-    "gulp-concat": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
-      "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
-      "dev": true,
-      "requires": {
-        "concat-with-sourcemaps": "1.1.0",
-        "through2": "2.0.5",
-        "vinyl": "2.2.0"
-      }
-    },
-    "gulp-copy": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/gulp-copy/-/gulp-copy-4.0.1.tgz",
-      "integrity": "sha512-UbdAwmEiVNNv55KAiUYWOP6Za7h8JPHNNyekNx8Gyc5XRlpUzTrlEclps939nOeiDPsd6jUtT2LmfavJirbZQg==",
-      "dev": true,
-      "requires": {
-        "gulp": "4.0.2",
-        "plugin-error": "0.1.2",
-        "through2": "2.0.5"
-      }
-    },
-    "gulp-header": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/gulp-header/-/gulp-header-2.0.9.tgz",
-      "integrity": "sha512-LMGiBx+qH8giwrOuuZXSGvswcIUh0OiioNkUpLhNyvaC6/Ga8X6cfAeme2L5PqsbXMhL8o8b/OmVqIQdxprhcQ==",
-      "requires": {
-        "concat-with-sourcemaps": "1.1.0",
-        "lodash.template": "4.5.0",
-        "map-stream": "0.0.7",
-        "through2": "2.0.5"
-      }
-    },
-    "gulp-rm-lines": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/gulp-rm-lines/-/gulp-rm-lines-0.0.9.tgz",
-      "integrity": "sha1-sKeCv5W/+kDgSI2rGcTVTqbC/gc=",
-      "dev": true,
-      "requires": {
-        "gulp-util": "3.0.8",
-        "through2": "2.0.5"
-      }
-    },
-    "gulp-util": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-      "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
-      "dev": true,
-      "requires": {
-        "array-differ": "1.0.0",
-        "array-uniq": "1.0.3",
-        "beeper": "1.1.1",
-        "chalk": "1.1.3",
-        "dateformat": "2.2.0",
-        "fancy-log": "1.3.3",
-        "gulplog": "1.0.0",
-        "has-gulplog": "0.1.0",
-        "lodash._reescape": "3.0.0",
-        "lodash._reevaluate": "3.0.0",
-        "lodash._reinterpolate": "3.0.0",
-        "lodash.template": "3.6.2",
-        "minimist": "1.2.0",
-        "multipipe": "0.1.2",
-        "object-assign": "3.0.0",
-        "replace-ext": "0.0.1",
-        "through2": "2.0.5",
-        "vinyl": "0.5.3"
-      },
-      "dependencies": {
-        "clone": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-          "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-          "dev": true
-        },
-        "clone-stats": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-          "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-          "dev": true
-        },
-        "lodash.template": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-          "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
-          "dev": true,
-          "requires": {
-            "lodash._basecopy": "3.0.1",
-            "lodash._basetostring": "3.0.1",
-            "lodash._basevalues": "3.0.0",
-            "lodash._isiterateecall": "3.0.9",
-            "lodash._reinterpolate": "3.0.0",
-            "lodash.escape": "3.2.0",
-            "lodash.keys": "3.1.2",
-            "lodash.restparam": "3.6.1",
-            "lodash.templatesettings": "3.1.1"
-          }
-        },
-        "lodash.templatesettings": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-          "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-          "dev": true,
-          "requires": {
-            "lodash._reinterpolate": "3.0.0",
-            "lodash.escape": "3.2.0"
-          }
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        },
-        "object-assign": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-          "dev": true
-        },
-        "replace-ext": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-          "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-          "dev": true
-        },
-        "vinyl": {
-          "version": "0.5.3",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-          "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-          "dev": true,
-          "requires": {
-            "clone": "1.0.4",
-            "clone-stats": "0.0.1",
-            "replace-ext": "0.0.1"
-          }
-        }
-      }
-    },
-    "gulpclass": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/gulpclass/-/gulpclass-0.2.0.tgz",
-      "integrity": "sha512-S2p0SgnVLjBbIEw5tHbBV6Wm6abD+leA5xZG6ukf9M+j1I/8zIeKPby9GLWnI90671YRk+lXbvEUROKaZXo8NA==",
-      "dev": true,
-      "requires": {
-        "@types/gulp": "4.0.6",
-        "@types/merge2": "1.3.0",
-        "@types/node": "13.5.0",
-        "gulp": "4.0.2",
-        "merge2": "1.3.0"
-      }
-    },
-    "gulplog": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-      "dev": true,
-      "requires": {
-        "glogg": "1.0.2"
-      }
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
-    },
-    "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "dev": true,
-      "requires": {
-        "ajv": "6.11.0",
-        "har-schema": "2.0.0"
-      }
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "2.1.1"
-      }
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
-    },
-    "has-gulplog": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
-      "dev": true,
-      "requires": {
-        "sparkles": "1.0.1"
-      }
-    },
-    "has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
-      "dev": true
-    },
-    "has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dev": true,
-      "requires": {
-        "get-value": "2.0.6",
-        "has-values": "1.0.0",
-        "isobject": "3.0.1"
-      }
-    },
-    "has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "dev": true,
-      "requires": {
-        "is-number": "3.0.0",
-        "kind-of": "4.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "1.1.6"
-          }
-        }
-      }
-    },
-    "home-or-tmp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
-      "dev": true,
-      "requires": {
-        "os-homedir": "1.0.2",
-        "os-tmpdir": "1.0.2"
-      }
-    },
-    "homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-      "dev": true,
-      "requires": {
-        "parse-passwd": "1.0.0"
-      }
-    },
-    "hosted-git-info": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
-      "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==",
-      "dev": true
-    },
-    "htmlparser2": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
-      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "1.3.1",
-        "domhandler": "2.4.2",
-        "domutils": "1.7.0",
-        "entities": "1.1.2",
-        "inherits": "2.0.4",
-        "readable-stream": "3.5.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz",
-          "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.4",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
-          }
-        }
-      }
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "jsprim": "1.4.1",
-        "sshpk": "1.16.1"
-      }
-    },
-    "ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "requires": {
-        "once": "1.4.0",
-        "wrappy": "1.0.2"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-      "dev": true
-    },
-    "ink-docstrap": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/ink-docstrap/-/ink-docstrap-1.3.0.tgz",
-      "integrity": "sha1-6QBeW7kCXMmpvo5ErYf4rViIyB0=",
-      "dev": true,
-      "requires": {
-        "moment": "2.24.0",
-        "sanitize-html": "1.21.1"
-      }
-    },
-    "interpret": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
-      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
-      "dev": true
-    },
-    "invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dev": true,
-      "requires": {
-        "loose-envify": "1.4.0"
-      }
-    },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true
-    },
-    "is-absolute": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
-      "dev": true,
-      "requires": {
-        "is-relative": "1.0.0",
-        "is-windows": "1.0.2"
-      }
-    },
-    "is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "requires": {
-        "kind-of": "3.2.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "1.1.6"
-          }
-        }
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
-      "requires": {
-        "binary-extensions": "1.13.1"
-      }
-    },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "requires": {
-        "kind-of": "3.2.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "1.1.6"
-          }
-        }
-      }
-    },
-    "is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "requires": {
-        "is-accessor-descriptor": "0.1.6",
-        "is-data-descriptor": "0.1.4",
-        "kind-of": "5.1.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
-      }
-    },
-    "is-dotfile": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-      "dev": true,
-      "optional": true
-    },
-    "is-equal-shallow": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "is-primitive": "2.0.0"
-      }
-    },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-    },
-    "is-finite": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
-      "requires": {
-        "number-is-nan": "1.0.1"
-      }
-    },
-    "is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
-      "requires": {
-        "number-is-nan": "1.0.1"
-      }
-    },
-    "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "2.1.1"
-      }
-    },
-    "is-negated-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
-      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
-      "dev": true
-    },
-    "is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "requires": {
-        "kind-of": "3.2.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "1.1.6"
-          }
-        }
-      }
-    },
-    "is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-      "dev": true
-    },
-    "is-path-in-cwd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-      "dev": true,
-      "requires": {
-        "is-path-inside": "1.0.1"
-      }
-    },
-    "is-path-inside": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-      "dev": true,
-      "requires": {
-        "path-is-inside": "1.0.2"
-      }
-    },
-    "is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "requires": {
-        "isobject": "3.0.1"
-      }
-    },
-    "is-posix-bracket": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-      "dev": true,
-      "optional": true
-    },
-    "is-primitive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-      "dev": true,
-      "optional": true
-    },
-    "is-relative": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-      "dev": true,
-      "requires": {
-        "is-unc-path": "1.0.0"
-      }
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
-    },
-    "is-unc-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-      "dev": true,
-      "requires": {
-        "unc-path-regex": "0.1.2"
-      }
-    },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
-    },
-    "is-valid-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
-      "dev": true
-    },
-    "is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
-    },
-    "js-tokens": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-      "dev": true
-    },
-    "js2xmlparser": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz",
-      "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=",
-      "dev": true,
-      "requires": {
-        "xmlcreate": "1.0.2"
-      }
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
-    },
-    "jsdoc": {
-      "version": "3.5.5",
-      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz",
-      "integrity": "sha512-6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg==",
-      "dev": true,
-      "requires": {
-        "babylon": "7.0.0-beta.19",
-        "bluebird": "3.5.5",
-        "catharsis": "0.8.11",
-        "escape-string-regexp": "1.0.5",
-        "js2xmlparser": "3.0.0",
-        "klaw": "2.0.0",
-        "marked": "0.3.19",
-        "mkdirp": "0.5.1",
-        "requizzle": "0.2.3",
-        "strip-json-comments": "2.0.1",
-        "taffydb": "2.6.2",
-        "underscore": "1.8.3"
-      },
-      "dependencies": {
-        "bluebird": {
-          "version": "3.5.5",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
-          "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
-          "dev": true
-        }
-      }
-    },
-    "jsesc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-      "dev": true
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
-    },
-    "json5": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-      "dev": true
-    },
-    "jsonc-parser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.2.1.tgz",
-      "integrity": "sha512-o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w==",
-      "dev": true
-    },
-    "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.2.3"
-      }
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
-    "just-debounce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
-      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
-      "dev": true
-    },
-    "kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true
-    },
-    "klaw": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz",
-      "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.2.3"
-      }
-    },
-    "last-run": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
-      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
-      "dev": true,
-      "requires": {
-        "default-resolution": "2.0.0",
-        "es6-weak-map": "2.0.3"
-      }
-    },
-    "lazystream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "2.3.7"
-      }
-    },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
-      "requires": {
-        "invert-kv": "1.0.0"
-      }
-    },
-    "lead": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
-      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
-      "dev": true,
-      "requires": {
-        "flush-write-stream": "1.1.1"
-      }
-    },
-    "liftoff": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
-      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
-      "dev": true,
-      "requires": {
-        "extend": "3.0.2",
-        "findup-sync": "3.0.0",
-        "fined": "1.2.0",
-        "flagged-respawn": "1.0.1",
-        "is-plain-object": "2.0.4",
-        "object.map": "1.0.1",
-        "rechoir": "0.6.2",
-        "resolve": "1.15.0"
-      }
-    },
-    "load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.2.3",
-        "parse-json": "2.2.0",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
-        "strip-bom": "2.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        }
-      }
-    },
-    "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-      "dev": true
-    },
-    "lodash._basecopy": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-      "dev": true
-    },
-    "lodash._basetostring": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
-      "dev": true
-    },
-    "lodash._basevalues": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
-      "dev": true
-    },
-    "lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-      "dev": true
-    },
-    "lodash._isiterateecall": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-      "dev": true
-    },
-    "lodash._reescape": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
-      "dev": true
-    },
-    "lodash._reevaluate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
-      "dev": true
-    },
-    "lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
-    },
-    "lodash._root": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
-      "dev": true
-    },
-    "lodash.camelcase": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
-      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
-      "dev": true
-    },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
-    },
-    "lodash.defaults": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
-      "dev": true
-    },
-    "lodash.difference": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
-      "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=",
-      "dev": true
-    },
-    "lodash.escape": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-      "dev": true,
-      "requires": {
-        "lodash._root": "3.0.1"
-      }
-    },
-    "lodash.escaperegexp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
-      "integrity": "sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=",
-      "dev": true
-    },
-    "lodash.flatten": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
-      "dev": true
-    },
-    "lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-      "dev": true
-    },
-    "lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-      "dev": true
-    },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
-      "dev": true
-    },
-    "lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=",
-      "dev": true
-    },
-    "lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-      "dev": true,
-      "requires": {
-        "lodash._getnative": "3.9.1",
-        "lodash.isarguments": "3.1.0",
-        "lodash.isarray": "3.0.4"
-      }
-    },
-    "lodash.mergewith": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
-      "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==",
-      "dev": true
-    },
-    "lodash.padend": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz",
-      "integrity": "sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4=",
-      "dev": true
-    },
-    "lodash.restparam": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-      "dev": true
-    },
-    "lodash.template": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
-      "requires": {
-        "lodash._reinterpolate": "3.0.0",
-        "lodash.templatesettings": "4.2.0"
-      }
-    },
-    "lodash.templatesettings": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
-      "requires": {
-        "lodash._reinterpolate": "3.0.0"
-      }
-    },
-    "lodash.toarray": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz",
-      "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=",
-      "dev": true
-    },
-    "lodash.union": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
-      "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=",
-      "dev": true
-    },
-    "long": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
-      "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=",
-      "dev": true
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "requires": {
-        "js-tokens": "3.0.2"
-      }
-    },
-    "luxon": {
-      "version": "1.21.3",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-1.21.3.tgz",
-      "integrity": "sha512-lLRwNcNnkZLuv13A1FUuZRZmTWF7ro2ricYvb0L9cvBYHPvZhQdKwrYnZzi103D2XKmlVmxWpdn2wfIiOt2YEw==",
-      "dev": true
-    },
-    "maestro-cli-roku": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/maestro-cli-roku/-/maestro-cli-roku-0.15.3.tgz",
-      "integrity": "sha512-+IWN7jQ69VmgKyc9KRJyg3tvq7CBUxyloSNBQvCW2hZn8dgSysbg82u0m7P49fh2oWZ61MBbONemOr5Ep1j3rw==",
-      "dev": true,
-      "requires": {
-        "adm-zip": "0.4.14",
-        "brightscript-language": "0.2.15",
-        "commander": "5.1.0",
-        "compare-directories": "0.1.0",
-        "debug": "4.1.1",
-        "dir-compare": "1.8.0",
-        "fs-extra": "5.0.0",
-        "glob-all": "3.1.0",
-        "lodash": "4.17.15",
-        "make-dir": "3.1.0",
-        "os": "0.1.1",
-        "replace-ext": "1.0.0",
-        "request-promise": "4.2.5",
-        "sax": "1.2.4",
-        "splice-string": "2.0.0"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-          "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-          "dev": true
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "requires": {
-        "semver": "6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "make-error": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz",
-      "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g=="
-    },
-    "make-iterator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-      "dev": true,
-      "requires": {
-        "kind-of": "6.0.3"
-      }
-    },
-    "map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true
-    },
-    "map-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-      "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg="
-    },
-    "map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "dev": true,
-      "requires": {
-        "object-visit": "1.0.1"
-      }
-    },
-    "marked": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz",
-      "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==",
-      "dev": true
-    },
-    "matchdep": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
-      "dev": true,
-      "requires": {
-        "findup-sync": "2.0.0",
-        "micromatch": "3.1.10",
-        "resolve": "1.15.0",
-        "stack-trace": "0.0.10"
-      },
-      "dependencies": {
-        "findup-sync": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-          "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
-          "dev": true,
-          "requires": {
-            "detect-file": "1.0.0",
-            "is-glob": "3.1.0",
-            "micromatch": "3.1.10",
-            "resolve-dir": "1.0.1"
-          }
-        },
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "2.1.1"
-          }
-        }
-      }
-    },
-    "math-random": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
-      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
-      "dev": true,
-      "optional": true
-    },
-    "memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "dev": true,
-      "requires": {
-        "errno": "0.1.7",
-        "readable-stream": "2.3.7"
-      }
-    },
-    "merge2": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz",
-      "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==",
-      "dev": true
-    },
-    "micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "requires": {
-        "arr-diff": "4.0.0",
-        "array-unique": "0.3.2",
-        "braces": "2.3.2",
-        "define-property": "2.0.2",
-        "extend-shallow": "3.0.2",
-        "extglob": "2.0.4",
-        "fragment-cache": "0.2.1",
-        "kind-of": "6.0.3",
-        "nanomatch": "1.2.13",
-        "object.pick": "1.3.0",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
-      }
-    },
-    "mime-db": {
-      "version": "1.43.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
-      "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==",
-      "dev": true
-    },
-    "mime-types": {
-      "version": "2.1.26",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz",
-      "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==",
-      "dev": true,
-      "requires": {
-        "mime-db": "1.43.0"
-      }
-    },
-    "minami": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/minami/-/minami-1.2.3.tgz",
-      "integrity": "sha1-mbbc37LwpU2hycj3qjoyd4eq+fg=",
-      "dev": true
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "requires": {
-        "brace-expansion": "1.1.11"
-      }
-    },
-    "minimist": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz",
-      "integrity": "sha1-md9lelJXTCHJBXSX33QnkLK0wN4=",
-      "dev": true
-    },
-    "mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dev": true,
-      "requires": {
-        "for-in": "1.0.2",
-        "is-extendable": "1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "2.0.4"
-          }
-        }
-      }
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
-      "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
-      }
-    },
-    "moment": {
-      "version": "2.24.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
-      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==",
-      "dev": true
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "multipipe": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
-      "dev": true,
-      "requires": {
-        "duplexer2": "0.0.2"
-      }
-    },
-    "mute-stdout": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
-      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
-      "dev": true
-    },
-    "mz": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-      "dev": true,
-      "requires": {
-        "any-promise": "1.3.0",
-        "object-assign": "4.1.1",
-        "thenify-all": "1.6.0"
-      }
-    },
-    "nan": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
-      "dev": true,
-      "optional": true
-    },
-    "nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "dev": true,
-      "requires": {
-        "arr-diff": "4.0.0",
-        "array-unique": "0.3.2",
-        "define-property": "2.0.2",
-        "extend-shallow": "3.0.2",
-        "fragment-cache": "0.2.1",
-        "is-windows": "1.0.2",
-        "kind-of": "6.0.3",
-        "object.pick": "1.3.0",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
-      }
-    },
-    "next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-      "dev": true
-    },
-    "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "requires": {
-        "hosted-git-info": "2.8.5",
-        "resolve": "1.15.0",
-        "semver": "5.7.1",
-        "validate-npm-package-license": "3.0.4"
-      }
-    },
-    "normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "requires": {
-        "remove-trailing-separator": "1.1.0"
-      }
-    },
-    "now-and-later": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
-      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
-      "dev": true,
-      "requires": {
-        "once": "1.4.0"
-      }
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
-    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
-    },
-    "object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dev": true,
-      "requires": {
-        "copy-descriptor": "0.1.1",
-        "define-property": "0.2.5",
-        "kind-of": "3.2.2"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "0.1.6"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "1.1.6"
-          }
-        }
-      }
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true
-    },
-    "object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "dev": true,
-      "requires": {
-        "isobject": "3.0.1"
-      }
-    },
-    "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-      "dev": true,
-      "requires": {
-        "define-properties": "1.1.3",
-        "function-bind": "1.1.1",
-        "has-symbols": "1.0.1",
-        "object-keys": "1.1.1"
-      }
-    },
-    "object.defaults": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-      "dev": true,
-      "requires": {
-        "array-each": "1.0.1",
-        "array-slice": "1.1.0",
-        "for-own": "1.0.0",
-        "isobject": "3.0.1"
-      }
-    },
-    "object.map": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
-      "dev": true,
-      "requires": {
-        "for-own": "1.0.0",
-        "make-iterator": "1.0.1"
-      }
-    },
-    "object.omit": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "for-own": "0.1.5",
-        "is-extendable": "0.1.1"
-      },
-      "dependencies": {
-        "for-own": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-          "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "for-in": "1.0.2"
-          }
-        }
-      }
-    },
-    "object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "requires": {
-        "isobject": "3.0.1"
-      }
-    },
-    "object.reduce": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
-      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
-      "dev": true,
-      "requires": {
-        "for-own": "1.0.0",
-        "make-iterator": "1.0.1"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1.0.2"
-      }
-    },
-    "ordered-read-streams": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
-      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "2.3.7"
+        }
       }
     },
-    "os": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/os/-/os-0.1.1.tgz",
-      "integrity": "sha1-IIhF6J4ZOtTZcUdLk5R3NqVtE/M=",
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
-    "os-homedir": {
+    "core-util-is": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
       "dev": true
     },
-    "os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+    "crc": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz",
+      "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==",
       "dev": true,
       "requires": {
-        "lcid": "1.0.0"
+        "buffer": "^5.1.0"
       }
     },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
-    },
-    "output-file-sync": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
-      "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
+    "crc32-stream": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-3.0.1.tgz",
+      "integrity": "sha512-mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w==",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.2.3",
-        "mkdirp": "0.5.1",
-        "object-assign": "4.1.1"
+        "crc": "^3.4.4",
+        "readable-stream": "^3.4.0"
       }
     },
-    "p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+    "cross-platform-clear-console": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cross-platform-clear-console/-/cross-platform-clear-console-2.3.0.tgz",
+      "integrity": "sha512-To+sJ6plHHC6k5DfdvSVn6F1GRGJh/R6p76bCpLbyMyHEmbqFyuMAeGwDcz/nGDWH3HUcjFTTX9iUSCzCg9Eiw==",
+      "dev": true
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "dev": true,
       "requires": {
-        "p-try": "1.0.0"
+        "assert-plus": "^1.0.0"
       }
     },
-    "p-map": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+    "dateformat": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
+      "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
       "dev": true
     },
-    "p-reflect": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-reflect/-/p-reflect-1.0.0.tgz",
-      "integrity": "sha1-9Poe4btUbY6z7AMhFI3+CnkTe7g=",
+    "debounce-promise": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/debounce-promise/-/debounce-promise-3.1.2.tgz",
+      "integrity": "sha512-rZHcgBkbYavBeD9ej6sP56XfG53d51CD4dnaw989YX/nZ/ZJfgRx/9ePKmTNiUiyQvh4mtrMoS3OAWW+yoYtpg==",
       "dev": true
     },
-    "p-settle": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-settle/-/p-settle-2.1.0.tgz",
-      "integrity": "sha512-NHFIUYc+fQTFRrzzAugq0l1drwi57PB522smetcY8C/EoTYs6cU/fC6TJj0N3rq5NhhJJbhf0VGWziL3jZDnjA==",
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "del": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/del/-/del-5.1.0.tgz",
+      "integrity": "sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==",
       "dev": true,
       "requires": {
-        "p-limit": "1.3.0",
-        "p-reflect": "1.0.0"
+        "globby": "^10.0.1",
+        "graceful-fs": "^4.2.2",
+        "is-glob": "^4.0.1",
+        "is-path-cwd": "^2.2.0",
+        "is-path-inside": "^3.0.1",
+        "p-map": "^3.0.0",
+        "rimraf": "^3.0.0",
+        "slash": "^3.0.0"
       }
     },
-    "p-try": {
+    "delayed-stream": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
       "dev": true
     },
-    "parse-filepath": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
-      "dev": true,
-      "requires": {
-        "is-absolute": "1.0.0",
-        "map-cache": "0.2.2",
-        "path-root": "0.1.1"
-      }
-    },
-    "parse-glob": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+    "dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "glob-base": "0.3.0",
-        "is-dotfile": "1.0.3",
-        "is-extglob": "1.0.0",
-        "is-glob": "2.0.1"
-      },
-      "dependencies": {
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-extglob": "1.0.0"
-          }
-        }
+        "path-type": "^4.0.0"
       }
     },
-    "parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
       "dev": true,
       "requires": {
-        "error-ex": "1.3.2"
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
       }
     },
-    "parse-node-version": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-      "dev": true
-    },
-    "parse-passwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-      "dev": true
-    },
-    "pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
     },
-    "path": {
-      "version": "0.12.7",
-      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
-      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
       "dev": true,
       "requires": {
-        "process": "0.11.10",
-        "util": "0.10.4"
+        "once": "^1.4.0"
       }
     },
-    "path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
       "dev": true
     },
-    "path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "dev": true,
-      "requires": {
-        "pinkie-promise": "2.0.1"
-      }
+    "eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "dev": true
     },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
     },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
       "dev": true
     },
-    "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
-    "path-root": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
+    "fast-glob": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
+      "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
       "dev": true,
       "requires": {
-        "path-root-regex": "0.1.2"
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.0",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.2",
+        "picomatch": "^2.2.1"
       }
     },
-    "path-root-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
       "dev": true
     },
-    "path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+    "fastq": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
+      "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.2.3",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        }
+        "reusify": "^1.0.4"
       }
     },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
-    },
-    "picomatch": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz",
-      "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==",
-      "dev": true
-    },
-    "pify": {
+    "file-url": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "resolved": "https://registry.npmjs.org/file-url/-/file-url-3.0.0.tgz",
+      "integrity": "sha512-g872QGsHexznxkIAdK8UiZRe7SkE6kvylShU4Nsj8NvfvZag7S0QuQ4IgvPDkk75HxgjIVDwycFTDAgIiO4nDA==",
       "dev": true
     },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "dev": true,
       "requires": {
-        "pinkie": "2.0.4"
+        "to-regex-range": "^5.0.1"
       }
     },
-    "plugin-error": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-      "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
+    "find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
       "requires": {
-        "ansi-cyan": "0.1.1",
-        "ansi-red": "0.1.1",
-        "arr-diff": "1.1.0",
-        "arr-union": "2.1.0",
-        "extend-shallow": "1.1.4"
-      },
-      "dependencies": {
-        "arr-diff": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-          "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "1.1.0",
-            "array-slice": "0.2.3"
-          }
-        },
-        "arr-union": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-          "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-          "dev": true
-        },
-        "array-slice": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-          "dev": true
-        },
-        "extend-shallow": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-          "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-          "dev": true,
-          "requires": {
-            "kind-of": "1.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-          "dev": true
-        }
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       }
     },
-    "posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
       "dev": true
     },
-    "postcss": {
-      "version": "7.0.26",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.26.tgz",
-      "integrity": "sha512-IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA==",
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.2",
-        "source-map": "0.6.1",
-        "supports-color": "6.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "1.9.3"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.5.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "3.0.0"
-              }
-            }
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "3.0.0"
-          }
-        }
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
       }
     },
-    "preserve": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-      "dev": true,
-      "optional": true
-    },
-    "pretty-hrtime": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-      "dev": true
-    },
-    "private": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-      "dev": true
-    },
-    "process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
-    "prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-      "dev": true
-    },
-    "psl": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz",
-      "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==",
+    "fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
       "dev": true
     },
-    "pump": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "1.4.4",
-        "once": "1.4.0"
-      }
-    },
-    "pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+    "fs-extra": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
       "dev": true,
       "requires": {
-        "duplexify": "3.7.1",
-        "inherits": "2.0.4",
-        "pump": "2.0.1"
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
       }
     },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
-    },
-    "q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
-    "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+    "fsevents": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "dev": true,
+      "optional": true
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true
     },
-    "randomatic": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
-      "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
       "dev": true,
-      "optional": true,
       "requires": {
-        "is-number": "4.0.0",
-        "kind-of": "6.0.3",
-        "math-random": "1.0.4"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true,
-          "optional": true
-        }
+        "assert-plus": "^1.0.0"
       }
     },
-    "read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+    "glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
       "dev": true,
       "requires": {
-        "load-json-file": "1.1.0",
-        "normalize-package-data": "2.5.0",
-        "path-type": "1.1.0"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       }
     },
-    "read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+    "glob-all": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/glob-all/-/glob-all-3.2.1.tgz",
+      "integrity": "sha512-x877rVkzB3ipid577QOp+eQCR6M5ZyiwrtaYgrX/z3EThaSPFtLDwBXFHc3sH1cG0R0vFYI5SRYeWMMSEyXkUw==",
       "dev": true,
       "requires": {
-        "find-up": "1.1.2",
-        "read-pkg": "1.1.0"
+        "glob": "^7.1.2",
+        "yargs": "^15.3.1"
       }
     },
-    "readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+    "glob-parent": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "dev": true,
       "requires": {
-        "core-util-is": "1.0.2",
-        "inherits": "2.0.4",
-        "isarray": "1.0.0",
-        "process-nextick-args": "2.0.1",
-        "safe-buffer": "5.1.2",
-        "string_decoder": "1.1.1",
-        "util-deprecate": "1.0.2"
+        "is-glob": "^4.0.1"
       }
     },
-    "readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+    "globby": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz",
+      "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.2.3",
-        "micromatch": "3.1.10",
-        "readable-stream": "2.3.7"
+        "@types/glob": "^7.1.1",
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.0.3",
+        "glob": "^7.1.3",
+        "ignore": "^5.1.1",
+        "merge2": "^1.2.3",
+        "slash": "^3.0.0"
       }
     },
-    "rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+    "graceful-fs": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+      "dev": true
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
       "dev": true,
       "requires": {
-        "resolve": "1.15.0"
+        "ajv": "^6.12.3",
+        "har-schema": "^2.0.0"
       }
     },
-    "recursive-readdir": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
-      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "dev": true,
       "requires": {
-        "minimatch": "3.0.4"
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
       }
     },
-    "reduce-flatten": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz",
-      "integrity": "sha1-JYx479FT3fk8tWEjf2EYTzaW4yc=",
+    "ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
       "dev": true
     },
-    "regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+    "ignore": {
+      "version": "5.1.8",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
       "dev": true
     },
-    "regex-cache": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+    "ignore-walk": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
+      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "is-equal-shallow": "0.1.3"
+        "minimatch": "^3.0.4"
       }
     },
-    "regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+    "indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dev": true,
       "requires": {
-        "extend-shallow": "3.0.2",
-        "safe-regex": "1.1.0"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
-    "remove-bom-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
-      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
       "requires": {
-        "is-buffer": "1.1.6",
-        "is-utf8": "0.2.1"
+        "binary-extensions": "^2.0.0"
       }
     },
-    "remove-bom-stream": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
-      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
       "dev": true,
       "requires": {
-        "remove-bom-buffer": "3.0.0",
-        "safe-buffer": "5.1.2",
-        "through2": "2.0.5"
+        "is-extglob": "^2.1.1"
       }
     },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true
     },
-    "repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+    "is-path-cwd": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
       "dev": true
     },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+    "is-path-inside": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
+      "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
       "dev": true
     },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
-      "requires": {
-        "is-finite": "1.0.2"
-      }
-    },
-    "replace-ext": {
+    "is-typedarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-      "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
       "dev": true
     },
-    "replace-homedir": {
+    "isarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
-      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
-      "dev": true,
-      "requires": {
-        "homedir-polyfill": "1.0.3",
-        "is-absolute": "1.0.0",
-        "remove-trailing-separator": "1.1.0"
-      }
-    },
-    "request": {
-      "version": "2.88.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-      "dev": true,
-      "requires": {
-        "aws-sign2": "0.7.0",
-        "aws4": "1.9.1",
-        "caseless": "0.12.0",
-        "combined-stream": "1.0.8",
-        "extend": "3.0.2",
-        "forever-agent": "0.6.1",
-        "form-data": "2.3.3",
-        "har-validator": "5.1.3",
-        "http-signature": "1.2.0",
-        "is-typedarray": "1.0.0",
-        "isstream": "0.1.2",
-        "json-stringify-safe": "5.0.1",
-        "mime-types": "2.1.26",
-        "oauth-sign": "0.9.0",
-        "performance-now": "2.1.0",
-        "qs": "6.5.2",
-        "safe-buffer": "5.1.2",
-        "tough-cookie": "2.4.3",
-        "tunnel-agent": "0.6.0",
-        "uuid": "3.4.0"
-      }
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
     },
-    "request-promise": {
-      "version": "4.2.5",
-      "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.5.tgz",
-      "integrity": "sha512-ZgnepCykFdmpq86fKGwqntyTiUrHycALuGggpyCZwMvGaZWgxW6yagT0FHkgo5LzYvOaCNvxYwWYIjevSH1EDg==",
-      "dev": true,
-      "requires": {
-        "bluebird": "3.7.2",
-        "request-promise-core": "1.1.3",
-        "stealthy-require": "1.1.1",
-        "tough-cookie": "2.4.3"
-      }
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
     },
-    "request-promise-core": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz",
-      "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==",
-      "dev": true,
-      "requires": {
-        "lodash": "4.17.15"
-      }
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true
     },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
       "dev": true
     },
-    "require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
-    "requizzle": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.3.tgz",
-      "integrity": "sha512-YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ==",
-      "dev": true,
-      "requires": {
-        "lodash": "4.17.15"
-      }
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
     },
-    "resolve": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz",
-      "integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==",
-      "dev": true,
-      "requires": {
-        "path-parse": "1.0.6"
-      }
+    "jsonc-parser": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
+      "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==",
+      "dev": true
     },
-    "resolve-dir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
       "dev": true,
       "requires": {
-        "expand-tilde": "2.0.2",
-        "global-modules": "1.0.0"
+        "graceful-fs": "^4.1.6"
       }
     },
-    "resolve-options": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
-      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
       "dev": true,
       "requires": {
-        "value-or-function": "3.0.0"
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
       }
     },
-    "resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "dev": true
-    },
-    "ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
-    },
-    "reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+    "latinize": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/latinize/-/latinize-0.4.1.tgz",
+      "integrity": "sha512-A4miz97dNF+EbNgQdayPAEtud5eRpCGPwJy7JQFD1hBQcOzOgBS4m721zoREuPqpz1yKm8hYT2ANlh7pirapsA==",
       "dev": true
     },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "requires": {
-        "glob": "7.1.6"
-      }
-    },
-    "roku-deploy": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/roku-deploy/-/roku-deploy-2.6.1.tgz",
-      "integrity": "sha512-TRe+PNc/kX1uSDweNy9VlSgSUd0js2qL05y72RKGixWap5m57ED/oze75KmvXnUYrMUc1opGR6vjCuMT7Fq50w==",
+    "lazystream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
+      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
       "dev": true,
       "requires": {
-        "archiver": "3.1.1",
-        "dateformat": "3.0.3",
-        "fs-extra": "7.0.1",
-        "glob-all": "3.1.0",
-        "path": "0.12.7",
-        "q": "1.5.1",
-        "request": "2.88.0"
+        "readable-stream": "^2.0.5"
       },
       "dependencies": {
-        "dateformat": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-          "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
-          "dev": true
-        },
-        "fs-extra": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.2.3",
-            "jsonfile": "4.0.0",
-            "universalify": "0.1.2"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           }
         }
       }
     },
-    "rooibos-cli": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/rooibos-cli/-/rooibos-cli-1.2.0.tgz",
-      "integrity": "sha512-yEJm8dfeyhEE/fCgr/JwaDqnxh1kflfwqtDroQQphmii11o+lhp6kc2SOhujApDJS0jkdEdf+E/FijvzxAttFQ==",
+    "locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
       "requires": {
-        "babel-cli": "6.26.0",
-        "brs": "0.17.4",
-        "commander": "4.1.0",
-        "debug": "4.1.1",
-        "es2015": "0.0.0",
-        "fs-extra": "5.0.0",
-        "glob-all": "3.1.0",
-        "lodash": "4.17.15",
-        "replace-ext": "1.0.0",
-        "request": "2.88.0",
-        "request-promise": "4.2.5",
-        "splice-string": "2.0.0",
-        "typescript": "3.7.4"
-      },
-      "dependencies": {
-        "brs": {
-          "version": "0.17.4",
-          "resolved": "https://registry.npmjs.org/brs/-/brs-0.17.4.tgz",
-          "integrity": "sha512-hASFOV+rQglgwbN05Nu3Q6hO/pvt/RpJtug47tjum67WCvRIAHXeCgg4cy9lDdFP5yEbAu8Tz48jeSO53RU0hQ==",
-          "dev": true,
-          "requires": {
-            "commander": "2.20.3",
-            "fast-glob": "3.1.1",
-            "long": "3.2.0",
-            "luxon": "1.21.3",
-            "memory-fs": "0.4.1",
-            "nanomatch": "1.2.13",
-            "p-settle": "2.1.0",
-            "xmldoc": "1.1.2"
-          },
-          "dependencies": {
-            "commander": {
-              "version": "2.20.3",
-              "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-              "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-              "dev": true
-            }
-          }
-        },
-        "commander": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.0.tgz",
-          "integrity": "sha512-NIQrwvv9V39FHgGFm36+U9SMQzbiHvU79k+iADraJTpmrFFfx7Ds0IvDoAdZsDrknlkRk14OYoWXb57uTh7/sw==",
-          "dev": true
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "typescript": {
-          "version": "3.7.4",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.4.tgz",
-          "integrity": "sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw==",
-          "dev": true
-        }
+        "p-locate": "^4.1.0"
       }
     },
-    "run-parallel": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
+    "lodash": {
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+      "dev": true
+    },
+    "lodash.defaults": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
+      "dev": true
+    },
+    "lodash.difference": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
+      "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=",
+      "dev": true
+    },
+    "lodash.flatten": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
+      "dev": true
+    },
+    "lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
+      "dev": true
+    },
+    "lodash.union": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
+      "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=",
+      "dev": true
+    },
+    "long": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
+      "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=",
+      "dev": true
+    },
+    "luxon": {
+      "version": "1.25.0",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-1.25.0.tgz",
+      "integrity": "sha512-hEgLurSH8kQRjY6i4YLey+mcKVAWXbDNlZRmM6AgWDJ1cY3atl8Ztf5wEY7VBReFbmGnwQPz7KYJblL8B2k0jQ==",
       "dev": true
     },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true
     },
-    "safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+    "micromatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
       "dev": true,
       "requires": {
-        "ret": "0.1.15"
+        "braces": "^3.0.1",
+        "picomatch": "^2.0.5"
       }
     },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+    "mime-db": {
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
       "dev": true
     },
-    "sanitize-html": {
-      "version": "1.21.1",
-      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.21.1.tgz",
-      "integrity": "sha512-W6enXSVphVaVbmVbzVngBthR5f5sMmhq3EfPfBlzBzp2WnX8Rnk7NGpP7KmHUc0Y3MVk9tv/+CbpdHchX9ai7g==",
+    "mime-types": {
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.2",
-        "htmlparser2": "3.10.1",
-        "lodash.clonedeep": "4.5.0",
-        "lodash.escaperegexp": "4.1.2",
-        "lodash.isplainobject": "4.0.6",
-        "lodash.isstring": "4.0.1",
-        "lodash.mergewith": "4.6.2",
-        "postcss": "7.0.26",
-        "srcset": "1.0.0",
-        "xtend": "4.0.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "1.9.3"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.5.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "3.0.0"
-          }
-        }
+        "mime-db": "1.44.0"
       }
     },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "moment": {
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz",
+      "integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA==",
       "dev": true
     },
-    "semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true
     },
-    "semver-greatest-satisfied-range": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
-      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
+    "npm-bundled": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
+      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
       "dev": true,
       "requires": {
-        "sver-compat": "1.5.0"
+        "npm-normalize-package-bin": "^1.0.1"
       }
     },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+    "npm-normalize-package-bin": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
+      "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
       "dev": true
     },
-    "set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+    "npm-packlist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.1.2.tgz",
+      "integrity": "sha512-eByPaP+wsKai0BJX5pmb58d3mfR0zUATcnyuvSxIudTEn+swCPFLxh7srCmqB4hr7i9V24/DPjjq5b2qUtbgXQ==",
       "dev": true,
       "requires": {
-        "extend-shallow": "2.0.1",
-        "is-extendable": "0.1.1",
-        "is-plain-object": "2.0.4",
-        "split-string": "3.1.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "0.1.1"
-          }
-        }
+        "glob": "^7.1.6",
+        "ignore-walk": "^3.0.3",
+        "npm-bundled": "^1.1.1",
+        "npm-normalize-package-bin": "^1.0.1"
       }
     },
-    "slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
       "dev": true
     },
-    "snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "dev": true,
       "requires": {
-        "base": "0.11.2",
-        "debug": "2.6.9",
-        "define-property": "0.2.5",
-        "extend-shallow": "2.0.1",
-        "map-cache": "0.2.2",
-        "source-map": "0.5.7",
-        "source-map-resolve": "0.5.3",
-        "use": "3.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "0.1.6"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "0.1.1"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
+        "wrappy": "1"
       }
     },
-    "snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+    "p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
       "dev": true,
       "requires": {
-        "define-property": "1.0.0",
-        "isobject": "3.0.1",
-        "snapdragon-util": "3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "1.0.2"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "6.0.3"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "6.0.3"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.3"
-          }
-        }
+        "p-try": "^1.0.0"
       }
     },
-    "snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+    "p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
+        "p-limit": "^2.2.0"
       },
       "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "p-try": "^2.0.0"
           }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
         }
       }
     },
-    "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-    },
-    "source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+    "p-map": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
+      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
       "dev": true,
       "requires": {
-        "atob": "2.1.2",
-        "decode-uri-component": "0.2.0",
-        "resolve-url": "0.2.1",
-        "source-map-url": "0.4.0",
-        "urix": "0.1.0"
+        "aggregate-error": "^3.0.0"
       }
     },
-    "source-map-support": {
-      "version": "0.5.16",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
-      "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
-      "requires": {
-        "buffer-from": "1.1.1",
-        "source-map": "0.6.1"
-      }
-    },
-    "source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-      "dev": true
-    },
-    "sparkles": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
+    "p-reflect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-reflect/-/p-reflect-1.0.0.tgz",
+      "integrity": "sha1-9Poe4btUbY6z7AMhFI3+CnkTe7g=",
       "dev": true
     },
-    "spdx-correct": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+    "p-settle": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-settle/-/p-settle-2.1.0.tgz",
+      "integrity": "sha512-NHFIUYc+fQTFRrzzAugq0l1drwi57PB522smetcY8C/EoTYs6cU/fC6TJj0N3rq5NhhJJbhf0VGWziL3jZDnjA==",
       "dev": true,
       "requires": {
-        "spdx-expression-parse": "3.0.0",
-        "spdx-license-ids": "3.0.5"
+        "p-limit": "^1.2.0",
+        "p-reflect": "^1.0.0"
       }
     },
-    "spdx-exceptions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
       "dev": true
     },
-    "spdx-expression-parse": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+    "parse-ms": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz",
+      "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==",
+      "dev": true
+    },
+    "path": {
+      "version": "0.12.7",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
+      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
       "dev": true,
       "requires": {
-        "spdx-exceptions": "2.2.0",
-        "spdx-license-ids": "3.0.5"
+        "process": "^0.11.1",
+        "util": "^0.10.3"
       }
     },
-    "spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+    "path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true
     },
-    "splice-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/splice-string/-/splice-string-2.0.0.tgz",
-      "integrity": "sha1-HpCypb6O0luBA2UlVZrIEqjB8wU=",
-      "dev": true,
-      "requires": {
-        "lodash.toarray": "4.4.0"
-      }
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
     },
-    "split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "3.0.2"
-      }
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true
     },
-    "srcset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/srcset/-/srcset-1.0.0.tgz",
-      "integrity": "sha1-pWad4StC87HV6D7QPHEEb8SPQe8=",
-      "dev": true,
-      "requires": {
-        "array-uniq": "1.0.3",
-        "number-is-nan": "1.0.1"
-      }
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
     },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dev": true,
-      "requires": {
-        "asn1": "0.2.4",
-        "assert-plus": "1.0.0",
-        "bcrypt-pbkdf": "1.0.2",
-        "dashdash": "1.14.1",
-        "ecc-jsbn": "0.1.2",
-        "getpass": "0.1.7",
-        "jsbn": "0.1.1",
-        "safer-buffer": "2.1.2",
-        "tweetnacl": "0.14.5"
-      }
+    "picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "dev": true
     },
-    "stack-trace": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
       "dev": true
     },
-    "static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "dev": true,
-      "requires": {
-        "define-property": "0.2.5",
-        "object-copy": "0.1.0"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "0.1.6"
-          }
-        }
-      }
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
     },
-    "stealthy-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
+    "psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true
     },
-    "stream-exhaust": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
-      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "dev": true
     },
-    "stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
       "dev": true
     },
-    "string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+    "readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
       "dev": true,
       "requires": {
-        "code-point-at": "1.1.0",
-        "is-fullwidth-code-point": "1.0.0",
-        "strip-ansi": "3.0.1"
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
       }
     },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+    "readdirp": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+      "dev": true,
       "requires": {
-        "safe-buffer": "5.1.2"
+        "picomatch": "^2.2.1"
       }
     },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "2.1.1"
+    "regexp-to-ast": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/regexp-to-ast/-/regexp-to-ast-0.5.0.tgz",
+      "integrity": "sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw==",
+      "dev": true
+    },
+    "request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
       }
     },
-    "strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "dev": true,
       "requires": {
-        "is-utf8": "0.2.1"
+        "glob": "^7.1.3"
       }
     },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true
-    },
-    "supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true
-    },
-    "sver-compat": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
-      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
+    "roku-deploy": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/roku-deploy/-/roku-deploy-3.2.3.tgz",
+      "integrity": "sha512-4h3yDAQl7uHzVjvu4XtvQJOYeKfBBhWcM3ss46RVT8HqYZdMJ5+kVP2+oPymA3U3pzGvtoSI/OuM0JG/VSNyGg==",
       "dev": true,
       "requires": {
-        "es6-iterator": "2.0.3",
-        "es6-symbol": "3.1.3"
+        "archiver": "^3.0.0",
+        "dateformat": "^3.0.3",
+        "fs-extra": "^7.0.1",
+        "glob": "^7.1.6",
+        "jsonc-parser": "^2.3.0",
+        "minimatch": "^3.0.4",
+        "path": "^0.12.7",
+        "request": "^2.88.0",
+        "xml2js": "^0.4.23"
       }
     },
-    "table-layout": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-0.4.5.tgz",
-      "integrity": "sha512-zTvf0mcggrGeTe/2jJ6ECkJHAQPIYEwDoqsiqBjI24mvRmQbInK5jq33fyypaCBxX08hMkfmdOqj6haT33EqWw==",
+    "ropm": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/ropm/-/ropm-0.5.0.tgz",
+      "integrity": "sha512-hoVElmmOtrlFKl66uBiIvjc82TeF0H1WiuGx6iJpel+zCh7MkQSZq8l9XYwTHM9FHVGaawkZJlOdGvBHaUphGQ==",
       "dev": true,
       "requires": {
-        "array-back": "2.0.0",
-        "deep-extend": "0.6.0",
-        "lodash.padend": "4.6.1",
-        "typical": "2.6.1",
-        "wordwrapjs": "3.0.0"
+        "@types/semver": "^7.3.1",
+        "@xml-tools/ast": "^5.0.0",
+        "@xml-tools/parser": "^1.0.7",
+        "del": "^5.1.0",
+        "fs-extra": "^9.0.1",
+        "glob-all": "^3.2.1",
+        "latinize": "^0.4.1",
+        "npm-packlist": "^2.1.2",
+        "roku-deploy": "^3.2.2",
+        "semver": "^7.3.2",
+        "yargs": "^15.4.1"
       },
       "dependencies": {
-        "array-back": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz",
-          "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==",
+        "fs-extra": {
+          "version": "9.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz",
+          "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==",
           "dev": true,
           "requires": {
-            "typical": "2.6.1"
+            "at-least-node": "^1.0.0",
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^1.0.0"
           }
         },
-        "typical": {
-          "version": "2.6.1",
-          "resolved": "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz",
-          "integrity": "sha1-XAgOXWYcu+OCWdLnCjxyU+hziB0=",
+        "jsonfile": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
+          "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6",
+            "universalify": "^1.0.0"
+          }
+        },
+        "universalify": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
+          "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
           "dev": true
         }
       }
     },
-    "taffydb": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz",
-      "integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg=",
+    "run-parallel": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
+      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
       "dev": true
     },
-    "tar-stream": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.0.tgz",
-      "integrity": "sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==",
-      "dev": true,
-      "requires": {
-        "bl": "3.0.0",
-        "end-of-stream": "1.4.4",
-        "fs-constants": "1.0.0",
-        "inherits": "2.0.4",
-        "readable-stream": "3.5.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz",
-          "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.4",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
-          }
-        }
-      }
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
     },
-    "thenify": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz",
-      "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=",
-      "dev": true,
-      "requires": {
-        "any-promise": "1.3.0"
-      }
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
     },
-    "thenify-all": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-      "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+    "semver": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+      "dev": true
+    },
+    "serialize-error": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
+      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
       "dev": true,
       "requires": {
-        "thenify": "3.3.0"
+        "type-fest": "^0.13.1"
       }
     },
-    "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "requires": {
-        "readable-stream": "2.3.7",
-        "xtend": "4.0.2"
-      }
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
     },
-    "through2-filter": {
+    "slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
-      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
-      "dev": true,
-      "requires": {
-        "through2": "2.0.5",
-        "xtend": "4.0.2"
-      }
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true
     },
-    "time-stamp": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
+    "source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
       "dev": true
     },
-    "to-absolute-glob": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
       "dev": true,
       "requires": {
-        "is-absolute": "1.0.0",
-        "is-negated-glob": "1.0.0"
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
       }
     },
-    "to-fast-properties": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-      "dev": true
-    },
-    "to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+    "string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "1.1.6"
-          }
-        }
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
       }
     },
-    "to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
       "requires": {
-        "define-property": "2.0.2",
-        "extend-shallow": "3.0.2",
-        "regex-not": "1.0.2",
-        "safe-regex": "1.1.0"
+        "safe-buffer": "~5.1.0"
       }
     },
-    "to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+    "strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
       "dev": true,
       "requires": {
-        "is-number": "3.0.0",
-        "repeat-string": "1.6.1"
+        "ansi-regex": "^5.0.0"
       }
     },
-    "to-through": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
-      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
       "requires": {
-        "through2": "2.0.5"
+        "has-flag": "^3.0.0"
       }
     },
-    "tough-cookie": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+    "tar-stream": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz",
+      "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==",
       "dev": true,
       "requires": {
-        "psl": "1.7.0",
-        "punycode": "1.4.1"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        }
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
       }
     },
-    "trim-right": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-      "dev": true
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
     },
-    "ts-node": {
-      "version": "8.6.2",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.6.2.tgz",
-      "integrity": "sha512-4mZEbofxGqLL2RImpe3zMJukvEvcO1XP8bj8ozBPySdCUXEcU5cIRwR0aM3R+VoZq7iXc8N86NC0FspGRqP4gg==",
+    "tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "dev": true,
       "requires": {
-        "arg": "4.1.2",
-        "diff": "4.0.2",
-        "make-error": "1.3.5",
-        "source-map-support": "0.5.16",
-        "yn": "3.1.1"
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
       }
     },
     "tunnel-agent": {
@@ -6781,7 +1648,7 @@
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "^5.0.1"
       }
     },
     "tweetnacl": {
@@ -6790,166 +1657,27 @@
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
       "dev": true
     },
-    "type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-      "dev": true
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
-    "typescript": {
-      "version": "3.7.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.4.tgz",
-      "integrity": "sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw==",
-      "dev": true
-    },
-    "typical": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz",
-      "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==",
-      "dev": true
-    },
-    "unc-path-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-      "dev": true
-    },
-    "underscore": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=",
-      "dev": true
-    },
-    "undertaker": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz",
-      "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==",
-      "dev": true,
-      "requires": {
-        "arr-flatten": "1.1.0",
-        "arr-map": "2.0.2",
-        "bach": "1.2.0",
-        "collection-map": "1.0.0",
-        "es6-weak-map": "2.0.3",
-        "last-run": "1.1.1",
-        "object.defaults": "1.1.0",
-        "object.reduce": "1.0.1",
-        "undertaker-registry": "1.0.1"
-      }
-    },
-    "undertaker-registry": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
+    "type-fest": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
       "dev": true
     },
-    "union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "3.1.0",
-        "get-value": "2.0.6",
-        "is-extendable": "0.1.1",
-        "set-value": "2.0.1"
-      }
-    },
-    "unique-stream": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
-      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
-      "dev": true,
-      "requires": {
-        "json-stable-stringify-without-jsonify": "1.0.1",
-        "through2-filter": "3.0.0"
-      }
-    },
     "universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "dev": true
     },
-    "unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
-      "requires": {
-        "has-value": "0.3.1",
-        "isobject": "3.0.1"
-      },
-      "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-          "dev": true,
-          "requires": {
-            "get-value": "2.0.6",
-            "has-values": "0.1.4",
-            "isobject": "2.1.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
-          }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-          "dev": true
-        }
-      }
-    },
-    "upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true
-    },
     "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
+      "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
       "dev": true,
       "requires": {
-        "punycode": "2.1.1"
+        "punycode": "^2.1.0"
       }
     },
-    "urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
-    },
-    "use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true
-    },
-    "user-home": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
-      "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
-      "dev": true
-    },
     "util": {
       "version": "0.10.4",
       "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
@@ -6970,7 +1698,8 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
     },
     "uuid": {
       "version": "3.4.0",
@@ -6978,129 +1707,40 @@
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
       "dev": true
     },
-    "v8flags": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz",
-      "integrity": "sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==",
-      "dev": true,
-      "requires": {
-        "homedir-polyfill": "1.0.3"
-      }
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "requires": {
-        "spdx-correct": "3.1.0",
-        "spdx-expression-parse": "3.0.0"
-      }
-    },
-    "value-or-function": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
-      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
-      "dev": true
-    },
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "dev": true,
       "requires": {
-        "assert-plus": "1.0.0",
+        "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
-        "extsprintf": "1.3.0"
-      }
-    },
-    "vinyl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
-      "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
-      "dev": true,
-      "requires": {
-        "clone": "2.1.2",
-        "clone-buffer": "1.0.0",
-        "clone-stats": "1.0.0",
-        "cloneable-readable": "1.1.3",
-        "remove-trailing-separator": "1.1.0",
-        "replace-ext": "1.0.0"
-      }
-    },
-    "vinyl-fs": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
-      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
-      "dev": true,
-      "requires": {
-        "fs-mkdirp-stream": "1.0.0",
-        "glob-stream": "6.1.0",
-        "graceful-fs": "4.2.3",
-        "is-valid-glob": "1.0.0",
-        "lazystream": "1.0.0",
-        "lead": "1.0.0",
-        "object.assign": "4.1.0",
-        "pumpify": "1.5.1",
-        "readable-stream": "2.3.7",
-        "remove-bom-buffer": "3.0.0",
-        "remove-bom-stream": "1.2.0",
-        "resolve-options": "1.1.0",
-        "through2": "2.0.5",
-        "to-through": "2.0.0",
-        "value-or-function": "3.0.0",
-        "vinyl": "2.2.0",
-        "vinyl-sourcemap": "1.1.0"
-      }
-    },
-    "vinyl-paths": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/vinyl-paths/-/vinyl-paths-2.1.0.tgz",
-      "integrity": "sha1-AIIEN8ujgmLO+IAthA+T4zku5Es=",
-      "dev": true,
-      "requires": {
-        "through2": "2.0.5"
-      }
-    },
-    "vinyl-sourcemap": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
-      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
-      "dev": true,
-      "requires": {
-        "append-buffer": "1.0.2",
-        "convert-source-map": "1.7.0",
-        "graceful-fs": "4.2.3",
-        "normalize-path": "2.1.1",
-        "now-and-later": "2.0.1",
-        "remove-bom-buffer": "3.0.0",
-        "vinyl": "2.2.0"
+        "extsprintf": "^1.2.0"
       }
     },
     "vscode-jsonrpc": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz",
-      "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
+      "integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==",
       "dev": true
     },
     "vscode-languageserver": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz",
-      "integrity": "sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz",
+      "integrity": "sha512-DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ==",
       "dev": true,
       "requires": {
-        "vscode-languageserver-protocol": "3.14.1",
-        "vscode-uri": "1.0.8"
+        "vscode-languageserver-protocol": "^3.15.3"
       }
     },
     "vscode-languageserver-protocol": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz",
-      "integrity": "sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==",
+      "version": "3.15.3",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz",
+      "integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==",
       "dev": true,
       "requires": {
-        "vscode-jsonrpc": "4.0.0",
-        "vscode-languageserver-types": "3.14.0"
+        "vscode-jsonrpc": "^5.0.1",
+        "vscode-languageserver-types": "3.15.1"
       }
     },
     "vscode-languageserver-textdocument": {
@@ -7110,64 +1750,66 @@
       "dev": true
     },
     "vscode-languageserver-types": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz",
-      "integrity": "sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==",
+      "version": "3.15.1",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
+      "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==",
       "dev": true
     },
     "vscode-uri": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.8.tgz",
-      "integrity": "sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz",
+      "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==",
       "dev": true
     },
-    "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "requires": {
-        "isexe": "2.0.0"
-      }
-    },
     "which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
       "dev": true
     },
-    "wordwrapjs": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-3.0.0.tgz",
-      "integrity": "sha512-mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw==",
+    "wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
       "dev": true,
       "requires": {
-        "reduce-flatten": "1.0.1",
-        "typical": "2.6.1"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
       },
       "dependencies": {
-        "typical": {
-          "version": "2.6.1",
-          "resolved": "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz",
-          "integrity": "sha1-XAgOXWYcu+OCWdLnCjxyU+hziB0=",
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         }
       }
     },
-    "wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "dev": true,
-      "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1"
-      }
-    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
     },
     "xml2js": {
       "version": "0.4.23",
@@ -7175,8 +1817,8 @@
       "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
       "dev": true,
       "requires": {
-        "sax": "1.2.4",
-        "xmlbuilder": "11.0.1"
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
       }
     },
     "xmlbuilder": {
@@ -7185,77 +1827,50 @@
       "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
       "dev": true
     },
-    "xmlcreate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz",
-      "integrity": "sha1-+mv3YqYKQT+z3Y9LA8WyaSONMI8=",
-      "dev": true
-    },
-    "xmldoc": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/xmldoc/-/xmldoc-1.1.2.tgz",
-      "integrity": "sha512-ruPC/fyPNck2BD1dpz0AZZyrEwMOrWTO5lDdIXS91rs3wtm4j+T8Rp2o+zoOYkkAxJTZRPOSnOGei1egoRmKMQ==",
-      "dev": true,
-      "requires": {
-        "sax": "1.2.4"
-      }
-    },
-    "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
-    },
     "y18n": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
       "dev": true
     },
     "yargs": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.2.6.tgz",
-      "integrity": "sha1-nHtKgv1dWVsr8Xq23MQxNUMv40s=",
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
       "dev": true,
       "requires": {
-        "minimist": "0.1.0"
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
       }
     },
     "yargs-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
       "dev": true,
       "requires": {
-        "camelcase": "3.0.0"
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
       }
     },
-    "yn": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="
-    },
     "zip-stream": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-2.1.3.tgz",
       "integrity": "sha512-EkXc2JGcKhO5N5aZ7TmuNo45budRaFGHOmz24wtJR7znbNqDPmdZtUauKX6et8KAVseAMBOyWJqEpXcHTBsh7Q==",
       "dev": true,
       "requires": {
-        "archiver-utils": "2.1.0",
-        "compress-commons": "2.1.1",
-        "readable-stream": "3.5.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz",
-          "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.4",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
-          }
-        }
+        "archiver-utils": "^2.1.0",
+        "compress-commons": "^2.1.1",
+        "readable-stream": "^3.4.0"
       }
     }
   }
diff --git a/package.json b/package.json
index 9d054809..38c8d33f 100644
--- a/package.json
+++ b/package.json
@@ -2,47 +2,20 @@
   "name": "rooibos",
   "version": "4.0.0",
   "description": "simple, flexible, fun brightscript test framework for roku scenegraph apps",
-  "main": "index.js",
-  "directories": {
-    "doc": "docs"
-  },
-  "dependencies": {
-    "gulp-header": "^2.0.7",
-    "rimraf": "^3.0.2"
-  },
+  "files": [
+    "dist/**/!(manifest)*"
+  ],
+  "dependencies": {},
   "devDependencies": {
-    "brighterscript": "^0.10.10",
-    "burp-brightscript": "^0.3.2",
-    "del": "^3.0.0",
-    "docdash": "^0.4.0",
-    "dotenv": "^8.1.0",
-    "generate-changelog": "^1.8.0",
-    "glob-all": "^3.2.1",
-    "gulp": "^4.0.2",
-    "gulp-concat": "^2.6.1",
-    "gulp-copy": "^4.0.1",
-    "gulp-rm-lines": "0.0.9",
-    "gulpclass": "^0.2.0",
-    "ink-docstrap": "1.3.0",
-    "jsdoc": "3.5.5",
-    "maestro-cli-roku": "^0.15.4",
-    "minami": "^1.2.3",
-    "minimist": "^1.2.5",
-    "roku-deploy": "^2.7.0",
-    "rooibos-cli": "^1.3.0",
-    "ts-node": "^8.10.2",
-    "typescript": "3.7.4",
-    "vinyl-paths": "^2.1.0"
-  },
-  "scripts": {
-    "use-live-cli": "npm install maestro-cli-roku --save-dev",
-    "use-local-cli": "npm install ../maestro-cli --save-dev"
+    "brighterscript": "^0.15.0",
+    "ropm": "^0.5.0"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/georgejecook/rooibos.git"
   },
   "keywords": [
+    "ropm",
     "brightscript",
     "unit",
     "testing",
@@ -54,5 +27,14 @@
   "bugs": {
     "url": "https://github.com/georgejecook/rooibos/issues"
   },
-  "homepage": "https://github.com/georgejecook/rooibos#readme"
+  "ropm": {
+    "rootDir": "src",
+    "packageRootDir": "dist"
+  },
+  "homepage": "https://github.com/georgejecook/rooibos#readme",
+  "scripts": {
+    "build": "npx bsc",
+    "test": "cd tests && npx ropm copy && bsc --project ./bsconfig.json",
+    "coverage": "cd tests && npx ropm copy && bsc --project ./bsconfig.coverage.json"
+  }
 }
diff --git a/samples/example/.rooibosrc.json b/samples/example/.rooibosrc.json
deleted file mode 100644
index c2b8c8d8..00000000
--- a/samples/example/.rooibosrc.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "testPath": "source/tests/specs",
-  "rootPath": "",
-  "outputPath": "source/tests/rooibos"
-}
\ No newline at end of file
diff --git a/samples/example/Makefile b/samples/example/Makefile
deleted file mode 100644
index 8e4c9b24..00000000
--- a/samples/example/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#########################################################################
-# Makefile Usage:
-# > make test ' run all tests
-# > make testFailures ' run all tests and show only failures
-#
-# 1) Make sure that you have the curl command line executable in your path
-# 2) Set the variable ROKU_DEV_TARGET in your environment to the IP
-#    address of your Roku box. (e.g. export ROKU_DEV_TARGET=192.168.1.1.
-#    Set in your this variable in your shell startup (e.g. .bashrc)
-# 3) and set up the DEVPASSWORD environment variable, too
-##########################################################################
-
-APPNAME = RooibosExampleApp
-VERSION = 0.1.0
-ROKU_TEST_ID = 1
-ROKU_TEST_WAIT_DURATION = 5
-
-ZIP_EXCLUDE= -x xml/* -x artwork/* -x \*.pkg -x storeassets\* -x keys\* -x \*/.\* -x *.git* -x *.DS* -x *.pkg* -x dist/**\*  -x out/**\* -x node_modules/**\* -x node_modules 
-
-include app.mk
-
-test: remove install
-	echo "Running tests"
-	curl -d '' "http://${ROKU_DEV_TARGET}:8060/keypress/home" 
-	curl -d '' "http://${ROKU_DEV_TARGET}:8060/launch/dev?RunTests=true&logLevel=4"
-	sleep 10 | telnet ${ROKU_DEV_TARGET} 8085
-
-testFailures: remove install
-	echo "Running tests - only showing failures"
-	curl -d '' "http://${ROKU_DEV_TARGET}:8060/keypress/home" 
-	curl -d '' "http://${ROKU_DEV_TARGET}:8060/launch/dev?RunTests=true&showOnlyFailures=true&logLevel=4"
-	sleep 10 | telnet ${ROKU_DEV_TARGET} 8085
-
-continuousIntegration: remove install
-	curl -d '' "http://${ROKU_DEV_TARGET}:8060/keypress/home" 
-	curl -d '' "http://${ROKU_DEV_TARGET}:8060/launch/dev?RunTests=true&testId=${ROKU_TEST_ID}"
-
-	-sleep ${ROKU_TEST_WAIT_DURATION} | telnet ${ROKU_DEV_TARGET} 8085 | tee dist/test.log
-	
-	if tail -2 dist/test.log | head | grep -q "RESULT: Success"; then echo "SUCCESS"; else exit -1; fi
-	
diff --git a/samples/example/app.mk b/samples/example/app.mk
deleted file mode 100755
index 7f1bfa47..00000000
--- a/samples/example/app.mk
+++ /dev/null
@@ -1,238 +0,0 @@
-#########################################################################
-# common include file for application Makefiles
-#
-# Makefile Common Usage:
-# > make
-# > make install
-# > make remove
-#
-# Makefile Less Common Usage:
-# > make art-opt
-# > make pkg
-# > make install_native
-# > make remove_native
-# > make tr
-#
-# By default, ZIP_EXCLUDE will exclude -x \*.pkg -x storeassets\* -x keys\* -x .\*
-# If you define ZIP_EXCLUDE in your Makefile, it will override the default setting.
-#
-# To exclude different files from being added to the zipfile during packaging
-# include a line like this:ZIP_EXCLUDE= -x keys\*
-# that will exclude any file who's name begins with 'keys'
-# to exclude using more than one pattern use additional '-x <pattern>' arguments
-# ZIP_EXCLUDE= -x \*.pkg -x storeassets\*
-#
-# Important Notes: 
-# To use the "install" and "remove" targets to install your
-# application directly from the shell, you must do the following:
-#
-# 1) Make sure that you have the curl command line executable in your path
-# 2) Set the variable ROKU_DEV_TARGET in your environment to the IP 
-#    address of your Roku box. (e.g. export ROKU_DEV_TARGET=192.168.1.1.
-#    Set in your this variable in your shell startup (e.g. .bashrc)
-##########################################################################  
-DISTREL = ../dist
-COMMONREL ?= ../common
-SOURCEREL = .
-
-ZIPREL = $(DISTREL)/apps
-PKGREL = $(DISTREL)/packages
-
-APPSOURCEDIR = source
-IMPORTFILES = $(foreach f,$(IMPORTS),$(COMMONREL)/$f.brs)
-IMPORTCLEANUP = $(foreach f,$(IMPORTS),$(APPSOURCEDIR)/$f.brs)
-
-NATIVEDEVREL  = $(DISTREL)/rootfs/Linux86_dev.OBJ/root/nvram/incoming
-NATIVEDEVPKG  = $(NATIVEDEVREL)/dev.zip
-NATIVETICKLER = $(DISTREL)/application/Linux86_dev.OBJ/root/bin/plethora  tickle-plugin-installer
-
-APPGENKEY = ./GENKEY
-APPDEVID = $(shell grep DevID $(APPGENKEY) | sed "s/DevID: //")
-GITCOMMIT = $(shell git rev-parse --short HEAD)
-BUILDDATE = $(shell date -u | awk '{ print $$2,$$3,$$6,$$4 }')
-
-ifdef DEVPASSWORD
-    USERPASS = rokudev:$(DEVPASSWORD)
-else
-    USERPASS = rokudev
-endif
-
-ifndef ZIP_EXCLUDE
-  ZIP_EXCLUDE= -x \*.pkg -x storeassets\* -x keys\* -x \*/.\*
-endif
-
-HTTPSTATUS = $(shell curl --silent --write-out "\n%{http_code}\n" $(ROKU_DEV_TARGET))
-
-ifeq "$(HTTPSTATUS)" " 401"
-	CURLCMD = curl -S --connect-timeout 2 --max-time 30 --retry 5
-else
-	CURLCMD = curl -S --connect-timeout 2 --max-time 30 --retry 5 --user $(USERPASS) --digest 
-endif
-
-.PHONY: all $(APPNAME) verify-keys home
-
-home:
-	@echo "Forcing roku to main menu screen $(ROKU_DEV_TARGET)..."
-	curl -s -S -d '' http://$(ROKU_DEV_TARGET):8060/keypress/home
-	sleep 2
-
-$(APPNAME): manifest
-	@echo "*** Creating $(APPNAME).zip ***"
-
-	@echo "  >> removing old application zip $(ZIPREL)/$(APPNAME).zip"
-	@if [ -e "$(ZIPREL)/$(APPNAME).zip" ]; \
-	then \
-		rm  $(ZIPREL)/$(APPNAME).zip; \
-	fi
-
-	@echo "  >> creating destination directory $(ZIPREL)"	
-	@if [ ! -d $(ZIPREL) ]; \
-	then \
-		mkdir -p $(ZIPREL); \
-	fi
-
-	@echo "  >> setting directory permissions for $(ZIPREL)"
-	@if [ ! -w $(ZIPREL) ]; \
-	then \
-		chmod 755 $(ZIPREL); \
-	fi
-
-	@echo "  >> copying imports"
-	@if [ "$(IMPORTFILES)" ]; \
-	then \
-		mkdir $(APPSOURCEDIR)/common; \
-		cp -f -p -v $(IMPORTFILES) $(APPSOURCEDIR)/common/; \
-	fi \
-
-	@echo "  >> generating build info file"
-	@if [ -e "$(APPSOURCEDIR)/buildinfo.brs" ]; \
-	then \
-		rm  $(APPSOURCEDIR)/buildinfo.brs; \
-	fi
-	echo "Function BuildDate()" >> $(APPSOURCEDIR)/buildinfo.brs
-	echo "  return \"${BUILDDATE}\"" >> $(APPSOURCEDIR)/buildinfo.brs
-	echo "End Function" >> $(APPSOURCEDIR)/buildinfo.brs
-	echo "Function BuildCommit()" >> $(APPSOURCEDIR)/buildinfo.brs
-	echo "  return \"${GITCOMMIT}\"" >> $(APPSOURCEDIR)/buildinfo.brs
-	echo "End Function" >> $(APPSOURCEDIR)/buildinfo.brs
-
-# zip .png files without compression
-# do not zip up Makefiles, or any files ending with '~'
-	@echo "  >> creating application zip $(ZIPREL)/$(APPNAME).zip"	
-	@if [ -d $(SOURCEREL) ]; \
-	then \
-		(zip -0 -r "$(ZIPREL)/$(APPNAME).zip" . -i \*.png $(ZIP_EXCLUDE)); \
-		(zip -9 -r "$(ZIPREL)/$(APPNAME).zip" . -x \*~ -x \*.png -x Makefile $(ZIP_EXCLUDE)); \
-	else \
-		echo "Source for $(APPNAME) not found at $(SOURCEREL)"; \
-	fi
-
-	@if [ "$(IMPORTCLEANUP)" ]; \
-	then \
-		echo "  >> deleting imports";\
-		rm -r -f $(APPSOURCEDIR)/common; \
-	fi \
-
-	@echo "*** packaging $(APPNAME) complete ***"
-
-
-install: $(APPNAME) home
-	@echo "Installing $(APPNAME) to host $(ROKU_DEV_TARGET)"
-	@$(CURLCMD) --user $(USERPASS) --digest -F "mysubmit=Install" -F "archive=@$(ZIPREL)/$(APPNAME).zip" -F "passwd=" http://$(ROKU_DEV_TARGET)/plugin_install | grep "<font color" | sed "s/<font color=\"red\">//" | sed "s[</font>[["
-
-# Make certain that the Roku is packaging with the correct key/DevID
-verify-keys: $(APPGENKEY)
-	@echo "Verifying developer key is $(APPDEVID)"
-	@if [ "$(HTTPSTATUS)" == " 401" ]; \
-  then \
-		ROKU_DEV_ID=`$(CURLCMD) --user $(USERPASS) --digest http://$(ROKU_DEV_TARGET)/plugin_package | grep $(APPDEVID)`; \
-		if [ "$$ROKU_DEV_IDx" == "x" ]; then echo "ROKU_DEV_ID doesn't match $(APPDEVID)"; exit 1; fi \
-	else \
-		ROKU_DEV_ID=`$(CURLCMD) http://$(ROKU_DEV_TARGET)/plugin_package | grep $(APPDEVID)`; \
-		if [ "$$ROKU_DEV_IDx" == "x" ]; then echo "ROKU_DEV_ID doesn't match $(APPDEVID)"; exit 1; fi \
-	fi
-
-pkg: install verify-keys
-	@echo "*** Creating Package ***"
-
-	@echo "  >> creating destination directory $(PKGREL)"	
-	@if [ ! -d $(PKGREL) ]; \
-	then \
-		mkdir -p $(PKGREL); \
-	fi
-
-	@echo "  >> setting directory permissions for $(PKGREL)"
-	@if [ ! -w $(PKGREL) ]; \
-	then \
-		chmod 755 $(PKGREL); \
-	fi
-
-	@echo "Packaging  $(APPSRC)/$(APPNAME) on host $(ROKU_DEV_TARGET)"
-	@if [ "$(HTTPSTATUS)" == " 401" ]; \
-	then \
-		read -p "Password: " REPLY ; echo $$REPLY | xargs -I{} $(CURLCMD) --user $(USERPASS) --digest -Fmysubmit=Package -Fapp_name=$(APPNAME)/$(VERSION) -Fpasswd={} -Fpkg_time=`expr \`date +%s\` \* 1000` "http://$(ROKU_DEV_TARGET)/plugin_package" | grep '^<tr><td><font face="Courier"><a' | sed 's/.*href=\"\([^\"]*\)\".*/\1/' | sed 's#pkgs//##' | xargs -I{} $(CURLCMD) --user $(USERPASS) --digest -o $(PKGREL)/$(APPNAME)_$(APPDEVID)_`date +%F-%T`.pkg http://$(ROKU_DEV_TARGET)/pkgs/{} ; \
-	else \
-		read -p "Password: " REPLY ; echo $$REPLY | xargs -I{} $(CURLCMD) -Fmysubmit=Package -Fapp_name=$(APPNAME)/$(VERSION) -Fpasswd={} -Fpkg_time=`expr \`date +%s\` \* 1000` "http://$(ROKU_DEV_TARGET)/plugin_package" | grep '^<tr><td><font face="Courier"><a' | sed 's/.*href=\"\([^\"]*\)\".*/\1/' | sed 's#pkgs//##' | xargs -I{} $(CURLCMD) -o $(PKGREL)/$(APPNAME)_$(APPDEVID)_`date +%F-%T`.pkg http://$(ROKU_DEV_TARGET)/pkgs/{} ; \
-	fi
-
-	@echo "*** Package  $(APPNAME) complete ***" 
-
-remove:
-	@echo "Removing $(APPNAME) from host $(ROKU_DEV_TARGET)"
-	@if [ "$(HTTPSTATUS)" == " 401" ]; \
-	then \
-		$(CURLCMD) --user $(USERPASS) --digest -F "mysubmit=Delete" -F "archive=" -F "passwd=" http://$(ROKU_DEV_TARGET)/plugin_install | grep "<font color" | sed "s/<font color=\"red\">//" | sed "s[</font>[[" ; \
-	else \
-		curl -s -S -F "mysubmit=Delete" -F "archive=" -F "passwd=" http://$(ROKU_DEV_TARGET)/plugin_install | grep "<font color" | sed "s/<font color=\"red\">//" | sed "s[</font>[[" ; \
-	fi
-
-install_native: $(APPNAME)
-	@echo "Installing $(APPNAME) to native."
-	@mkdir -p $(NATIVEDEVREL)
-	@cp $(ZIPREL)/$(APPNAME).zip  $(NATIVEDEVPKG)
-	@$(NATIVETICKLER)
-
-remove_native:
-	@echo "Removing $(APPNAME) from native."
-	@rm $(NATIVEDEVPKG)
-	@$(NATIVETICKLER)
-
-APPS_JPG_ART=`\find . -name "*.jpg"`
-
-art-jpg-opt:
-	p4 edit $(APPS_JPG_ART)
-	for i in $(APPS_JPG_ART); \
-	do \
-		TMPJ=`mktemp` || return 1; \
-		echo "optimizing $$i"; \
-		(jpegtran -copy none -optimize -outfile $$TMPJ $$i && mv -f $$TMPJ $$i &); \
-	done
-	wait
-	p4 revert -a $(APPS_JPG_ART)
-
-APPS_PNG_ART=`\find . -name "*.png"`
-
-art-png-opt:
-	p4 edit $(APPS_PNG_ART)
-	for i in $(APPS_PNG_ART); \
-	do \
-		(optipng -o7 $$i &); \
-	done
-	wait
-	p4 revert -a $(APPS_PNG_ART)
-
-art-opt: art-png-opt art-jpg-opt
-
-tr:
-	p4 edit locale/.../translations.xml
-	../../rdk/rokudev/utilities/linux/bin/maketr
-	rm locale/en_US/translations.xml
-	p4 revert -a locale/.../translations.xml
-
-screenshot:
-	SCREENSHOT_TIME=`date "+%s"`; \
-	curl -m 1 -o screenshot.jpg --user $(USERPASS) --digest "http://$(ROKU_DEV_TARGET)/pkgs/dev.jpg?time=$$SCREENSHOT_TIME" -H 'Accept: image/png,image/*;q=0.8,*/*;q=0.5' -H 'Accept-Language: en-US,en;q=0.5' -H 'Accept-Encoding: gzip, deflate'
-
-
-
-
diff --git a/samples/example/components/NodeExample.brs b/samples/example/components/NodeExample.brs
deleted file mode 100644
index be82d92f..00000000
--- a/samples/example/components/NodeExample.brs
+++ /dev/null
@@ -1,15 +0,0 @@
-function Init() as void
-    m.nameText = m.top.findNode("nameText")
-end function
-
-function HelloFromNode(name, age) as string
-    return "HELLO " + name + " age:" + stri(age)
-end function
-
-function UpdateState(newState) as void
-    m.top.state = newState 
-end function
-
-function SetLabelText(newText) as void
-    m.nameText.text = newText
-end function
\ No newline at end of file
diff --git a/samples/example/components/NodeExample.xml b/samples/example/components/NodeExample.xml
deleted file mode 100644
index 3f5bcfc2..00000000
--- a/samples/example/components/NodeExample.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component
-	name="NodeExample"
-	extends="Group"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="https://devtools.web.roku.com/schema/RokuSceneGraph.xsd"
->
-	<interface>
-		<!-- public fields/functions -->
-		<field
-			type="string"
-			id="state" />
-	</interface>
-
-	<script
-		type="text/brightscript"
-		uri="NodeExample.brs" />
-
-
-	<children>
-		<Label
-			id="nameText"
-			text="name" />
-
-		<Button
-			id="button1"
-			text="button1" />
-		<Button
-			id="button2"
-			text="button2" />
-	</children>
-
-</component>
diff --git a/samples/example/components/tests/rooibos/TestsScene.brs b/samples/example/components/tests/rooibos/TestsScene.brs
deleted file mode 100644
index 4927ff7b..00000000
--- a/samples/example/components/tests/rooibos/TestsScene.brs
+++ /dev/null
@@ -1,3 +0,0 @@
-Function Init() as Void
-  'do any specifici setup you want done here, like setting things on m.global
-End Function
\ No newline at end of file
diff --git a/samples/example/components/tests/rooibos/TestsScene.xml b/samples/example/components/tests/rooibos/TestsScene.xml
deleted file mode 100644
index 1610ceec..00000000
--- a/samples/example/components/tests/rooibos/TestsScene.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component
-  name="TestsScene"
-  extends="Scene"
->
-  <interface>
-    <function name="Rooibos_CreateTestNode" />
-  </interface>
-
-  <script type="text/brightscript" uri="TestsScene.brs" />
-
-  <script type="text/brightscript" uri="pkg:/source/tests/rooibos/rooibosDist.brs" />
-</component>
diff --git a/samples/example/components/tests/specs/NodeExampleTests.xml b/samples/example/components/tests/specs/NodeExampleTests.xml
deleted file mode 100644
index e93b9655..00000000
--- a/samples/example/components/tests/specs/NodeExampleTests.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component
-	name="NodeExampleTests"
-	extends="NodeExample"
-	xsi:noNamespaceSchemaLocation="https://devtools.web.roku.com/schema/RokuSceneGraph.xsd"
->
-	<interface>
-		<!-- public fields/functions -->
-		<!-- <function name="Rooibos_RunNodeTests" /> -->
-	</interface>
-
-	<script
-		type="text/brightscript"
-		uri="pkg:/source/tests/specs/NodeExampleTests.brs" />
-
-	<script
-		type="text/brightscript"
-		uri="pkg:/source/tests/rooibos/rooibosFunctionMap.brs" />
-
-	<script
-		type="text/brightscript"
-		uri="pkg:/source/tests/rooibos/rooibosDist.brs" />
-	<script
-		type="text/brightscript"
-		uri="pkg:/source/tests/rooibos/TestUtils.brs" />
-
-</component>
diff --git a/samples/example/source/VideoModule.brs b/samples/example/source/VideoModule.brs
deleted file mode 100644
index 5d906660..00000000
--- a/samples/example/source/VideoModule.brs
+++ /dev/null
@@ -1,48 +0,0 @@
-function VideoModule(constants, httpService)
-  
-  return {
-    'private vars
-    constants_: constants
-    httpService_: httpService
-    
-    'public api
-    getVideos: getVideos_
-    getVideosRealExample: getVideosRealExample_
-  }
-end function
-
-function getVideos_(videoType) as Object
-  videos = []
-  
-'  result = httpService.getJson("https://myVideos.com/videos", "5ffcceea5")
-  videoCount = 3
-  if (videoType = "mpg")
-    videoCount = 2
-  else if (videoType = "vp8")
-    videoCount = 1
-  end if
-  
-  for i = 0 to videoCount -1
-    videos.push({id:"video_" + stri(i).trim(), "type":videoType})
-  end for
-  return videos
-end function
-
-
-function getVideosRealExample_(videoType) as Object
-  videos = []
-
-  result = m.httpService_.getJson("https://myVideos.com/videos/", videoType)
-  
-  if (type(result) = "roArray")
-    for each video in result
-      videos.push(video)
-    end for
-  end if
-  
-  return videos
-end function
-
-
-
-
diff --git a/samples/example/source/buildinfo.brs b/samples/example/source/buildinfo.brs
deleted file mode 100644
index d8d40f3d..00000000
--- a/samples/example/source/buildinfo.brs
+++ /dev/null
@@ -1,6 +0,0 @@
-Function BuildDate()
-  return "13 Mar UTC 2019"
-End Function
-Function BuildCommit()
-  return "a3171ff"
-End Function
diff --git a/samples/example/source/main.brs b/samples/example/source/main.brs
deleted file mode 100644
index 3f2e05d8..00000000
--- a/samples/example/source/main.brs
+++ /dev/null
@@ -1,62 +0,0 @@
-sub Main(args as dynamic)
-    ? "Launching with args "
-    ? args
-    m.args = args
-
-    if (type(Rooibos__Init) = "Function") then Rooibos__Init()
-
-    InitScreen()
-end sub
-
-
-function InitScreen() as void
-    'this will be where you setup your typical roku app
-    'it will not be launched when running unit tests
-    screen = CreateObject("roSGScreen")
-    m.port = CreateObject("roMessagePort")
-    screen.setMessagePort(m.port)
-    
-    rootScene = screen.CreateScene("MainScene")
-    rootScene.id = "ROOT"
-    
-    screen.show()
-
-    SetupGlobals(screen)
-    
-    while(true)
-        msg = wait(0, m.port)
-        msgType = type(msg)
-      
-        if msgType = "roSGScreenEvent"
-            if msg.isScreenClosed() 
-                return
-            end if
-        end if
-    end while
-end function
-
-
-'*************************************************************
-'** SetupGlobals
-'** @param screen as roScreen - screen to set globals on
-'*************************************************************
-function SetupGlobals(screen) as void
-    ? "SETTTING UP GLOBALS - do your standard setup stuff here"
-
-    m.global = screen.getGlobalNode()
-
-    m.roDeviceInfo = CreateObject("roDeviceInfo")
-    
-    m.displayInfo = {
-        resolution: m.roDeviceInfo.GetUIResolution() 
-        displayType: m.roDeviceInfo.GetDisplayType() 
-        width: m.roDeviceInfo.GetDisplaySize().w
-        height: m.roDeviceInfo.GetDisplaySize().h
-        wFactor: m.roDeviceInfo.GetDisplaySize().w/1920
-        hFactor: m.roDeviceInfo.GetDisplaySize().h/1080
-    }
-
-    m.modelLocator = {"displayInfo":m.displayInfo} ' contrived example : this would be a specifc modelLocator node/other setup thing
-
-    m.global.addFields({"modelLocator": m.modelLocator})
-end function
diff --git a/samples/example/source/tests/rooibos/TestUtils.brs b/samples/example/source/tests/rooibos/TestUtils.brs
deleted file mode 100644
index 8a2a5a19..00000000
--- a/samples/example/source/tests/rooibos/TestUtils.brs
+++ /dev/null
@@ -1,19 +0,0 @@
-
-sub AddTestUtils(testCase)
-    'add your own test utils you want access to when testing here
-    'e.g.
-    testCase.testUtils = TU_MakeTestUtils()
-    'testCase._ = rodash()
-    'etc etc
-end sub
-
-Function TU_MakeTestUtils() as Object
-    return {
-      SayHello:TU_SayHello
-    }
-  
-End Function
-
-Function TU_SayHello(name) as Void
-    ? " hello " ; name
-End Function
\ No newline at end of file
diff --git a/samples/example/source/tests/rooibos/testConfig.json b/samples/example/source/tests/rooibos/testConfig.json
deleted file mode 100644
index 7b3908f8..00000000
--- a/samples/example/source/tests/rooibos/testConfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"logLevel": 1,
-	"testsDirectory": "pkg:/source/tests/specs",
-	"failFast": false,
-	"showOnlyFailures": false,
-	"maxLinesWithoutSuiteDirective": 30,
-	"supportLegacyTests": true
-}
diff --git a/samples/example/source/tests/specs/NodeExampleTests.brs b/samples/example/source/tests/specs/NodeExampleTests.brs
deleted file mode 100644
index 0d8bbcb3..00000000
--- a/samples/example/source/tests/specs/NodeExampleTests.brs
+++ /dev/null
@@ -1,36 +0,0 @@
-'@SGNode NodeExampleTests
-'@TestSuite [NET] Node Example Tests
-
-'@Setup
-function NET_setup() as void
-    m.setupThing = "something created during setup"
-end function
-
-'@Only
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests methods present on the node
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@BeforeEach
-function NET_BeforeEach() as void
-    m.beforeEachThing = "something created beforeEach"
-end function
-
-'@Test HelloFromNode
-function NET__HelloFromNode_simple() as void
-    text = HelloFromNode("georgejecook", 12)
-    m.AssertEqual(text, "HELLO georgejecook" + " age:" + stri(12))
-end function
-
-'@Test HelloFromNode with params
-'@Params["jon", 40]
-'@Params["ringo", 23]
-'@Params["ringo", 50]
-'@Params["ringo", 24]
-'@Params["george", 40]
-'@Params["paul", 50]
-function NET__HelloFromNode_params(name, age) as void
-    text = HelloFromNode(name, age)
-    m.AssertEqual(text, "HELLO " + name + " age:" + stri(age))
-end function
-
diff --git a/samples/example/source/tests/specs/VideoModuleTests.brs b/samples/example/source/tests/specs/VideoModuleTests.brs
deleted file mode 100644
index 2b229069..00000000
--- a/samples/example/source/tests/specs/VideoModuleTests.brs
+++ /dev/null
@@ -1,62 +0,0 @@
-'@TestSuite [VMT] VideoModuleTests
-
-'@BeforeEach
-function VMT_BeforeEach()
-  m.constants = {}
-  m.httpService = {}
-  
-  m.module = VideoModule(m.constants, m.httpService)
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests constructor
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test basic constructor values
-function VMT__constructor_basic() as void
-	m.AssertEqual(m.module.constants_, m.constants)
-	m.AssertEqual(m.module.httpService_, m.httpService)
-end function
-
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests getVideos
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test basic test
-'@Params[3, "mp4", ["video_0", "video_1", "video_2"]]
-'@Params[2, "mpg", ["video_0", "video_1"]]
-'@Params[1, "vp8", ["video_0"]]
-function VMT__getVideos_basic(expectedCount, videoType, videoIds) as void
-	videos = m.module.getVideos(videoType)
-
-	m.AssertArrayCount(videos, expectedCount)
-	m.AssertArrayContainsAAs(videos, [{"type":videoType}])
-	
-	expectedIds = []
-	for each id in videoIds
-	  expectedIds.push({"id": id})
-	end for
-	
-	m.AssertArrayContainsAAs(videos, expectedIds)
-end function
-
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-'@It tests getVideosRealExample
-'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-'@Test basic test
-'@Params["mp4", ["a", "b", "c"]]
-'@Params["mp3", ["a", "b", "c", "d", "e"]]
-function VMT__getVideosRealExample_basic(videoType, returnedJson) as void
-  getjsonMock = m.expectOnce(m.httpService, "getJson", [m.ignoreValue, videoType], returnedJson, true)
-
-  videos = m.module.getVideosRealExample(videoType)
-  
-  m.AssertArrayContainsSubset(videos, returnedJson)
-end function
-
-
-
-
-
diff --git a/samples/example/source/tests/specs/test_LegacyIntegration.brs b/samples/example/source/tests/specs/test_LegacyIntegration.brs
deleted file mode 100644
index 9e434267..00000000
--- a/samples/example/source/tests/specs/test_LegacyIntegration.brs
+++ /dev/null
@@ -1,26 +0,0 @@
-Function testSuite_LegacyIntegration()
-  this = BaseTestSuite()
-
-  this.Name = "LegacyIntegrationTestSuite"
-
-  this.SetUp = LegacyIntegrationTestSuite_SetUp
-
-  this.addTest("simpleResult", testCase_LegacyIntegration_simpleResult)
-  this.addTest("multipleAsserts", testCase_LegacyIntegration_multipleAsserts)
-  return this
-End Function
-
-
-Function LegacyIntegrationTestSuite_SetUp()
-  m.testData = {"key": "value"}
-End Function
-
-Function testCase_LegacyIntegration_simpleResult()
-  return m.AssertNotInvalid(m.testData)
-End Function
-
-
-Function testCase_LegacyIntegration_multipleAsserts()
-  result = m.AssertNotInvalid(m.testData)
-  result += m.AssertEqual(m.testdata.key, "value")
-End Function
diff --git a/src/BaseTestSuite.bs b/src/BaseTestSuite.bs
deleted file mode 100644
index 5dba0729..00000000
--- a/src/BaseTestSuite.bs
+++ /dev/null
@@ -1,1929 +0,0 @@
-namespace Rooibos
-
-  ' /**
-  '  * @module BaseTestSuite
-  '  * @description All brs files that include `'@TestSuite` annotations automatically extend the BaseTestSuite.
-  '  * The base test suite contains all of the assertions, and utility methods required to writey our tests, as well as being responsible for tracking the state of the tests and groups.
-  '  */
-  class BaseTestSuite
-
-    public name = "BaseTestSuite"
-    public invalidValue = "#ROIBOS#INVALID_VALUE" ' special value used in mock arguments
-    public ignoreValue = "#ROIBOS#IGNORE_VALUE" ' special value used in mock arguments
-
-    'built in any matchers
-    public anyStringMatcher = { "matcher": Rooibos_Matcher_anyString }
-    public anyBoolMatcher = { "matcher": Rooibos_Matcher_anyBool }
-    public anyNumberMatcher = { "matcher": Rooibos_Matcher_anyNumber }
-    public anyAAMatcher = { "matcher": Rooibos_Matcher_anyAA }
-    public anyArrayMatcher = { "matcher": Rooibos_Matcher_anyArray }
-    public anyNodeMatcher = { "matcher": Rooibos_Matcher_anyNode }
-    public allowNonExistingMethodsOnMocks = true
-    public isAutoAssertingMocks = true
-
-    'Test Cases methods
-    public testCases = []
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name addTest
-    '  * @function
-    '  * @instance
-    '  * @description Add a test to a suite's test cases array. Used internally.
-    '  * @param {Dynamic} name - A test name.
-    '  * @param {Dynamic} func - A test function name.
-    '  */
-    public function addTest(name, func, funcName, setup = invalid, teardown = invalid)
-      m.testCases.Push(m.createTest(name, func, setup, teardown))
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name createTest
-    '  * @function
-    '  * @instance
-    '  * @description Create a test object. Used internally
-    '  * @param {Dynamic} name - A test name.
-    '  * @param {Dynamic} func - A test function name.
-    '  */
-    public function createTest(name, func, funcName, setup = invalid, teardown = invalid) as object
-
-      if (func = invalid)
-        ? " ASKED TO CREATE TEST WITH INVALID FUNCITON POINTER FOR FUNCTION " ; funcName
-      end if
-
-      return {
-        name: name
-        func: func
-        funcName: funcName
-        setUp: setup
-        tearDown: teardown
-      }
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name fail
-    '  * @function
-    '  * @instance
-    '  * @description Fail immediately, with the given message
-    '  * @param {Dynamic} [msg=""] - message to display in the test report
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function fail(msg = "Error") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      m.currentResult.addResult(msg)
-      return m.getLegacyCompatibleReturnValue(false)
-    end function
-
-    '*************************************************************
-    '** GetLegacyCompatibleReturnValue
-    '** will return the correct type of return value for a new-style/legacy test
-    '*************************************************************
-    public function getLegacyCompatibleReturnValue(value) as object
-      if (value = true)
-        if (m.isLegacy = true)
-          return ""
-        else
-          return true
-        end if
-      else
-        if (m.isLegacy = true)
-          return "ERROR"
-        else
-          return false
-        end if
-      end if
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertFalse
-    '  * @function
-    '  * @instance
-    '  * @description Fail the test if the expression is true.
-    '  * @param {Dynamic} expr - An expression to evaluate.
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    ' Default value: "Expression evaluates to true"'  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertFalse(expr, msg = "Expression evaluates to true") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if not Rooibos.Common.isBoolean(expr) or expr
-        return m.fail(msg)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertTrue
-    '  * @function
-    '  * @instance
-    '  * @description Fail the test unless the expression is true.
-    '  * @param {Dynamic} expr - An expression to evaluate.
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertTrue(expr, msg = "Expression evaluates to false")
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-
-      if not Rooibos.Common.isBoolean(expr) or not expr
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertEqual
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the two objects are unequal as determined by the '<>' operator.
-    '  * @param {Dynamic} first - first object to compare
-    '  * @param {Dynamic} second - second object to compare
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertEqual(first, second, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if not Rooibos.Common.eqValues(first, second)
-        if msg = ""
-          first_as_string = Rooibos.Common.asString(first)
-          second_as_string = Rooibos.Common.asString(second)
-          msg = first_as_string + " != " + second_as_string
-        end if
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertLike
-    '  * @function
-    '  * @instance
-    '  * @description does a fuzzy comparison
-    '  * @param {Dynamic} first - first object to compare
-    '  * @param {Dynamic} second - second object to compare
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertLike(first, second, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if first <> second
-        if msg = ""
-          first_as_string = Rooibos.Common.asString(first)
-          second_as_string = Rooibos.Common.asString(second)
-          msg = first_as_string + " != " + second_as_string
-        end if
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertNotEqual
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the two objects are equal as determined by the '=' operator.
-    '  * @param {Dynamic} first - first object to compare
-    '  * @param {Dynamic} second - second object to compare
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertNotEqual(first, second, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if Rooibos.Common.eqValues(first, second)
-        if msg = ""
-          first_as_string = Rooibos.Common.asString(first)
-          second_as_string = Rooibos.Common.asString(second)
-          msg = first_as_string + " == " + second_as_string
-        end if
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertInvalid
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the value is not invalid.
-    '  * @param {Dynamic} value - value to check - value to check for
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertInvalid(value, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if value <> invalid
-        if msg = ""
-          expr_as_string = Rooibos.Common.asString(value)
-          msg = expr_as_string + " <> Invalid"
-        end if
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertNotInvalid
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the value is invalid.
-    '  * @param {Dynamic} value - value to check - value to check for
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertNotInvalid(value, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if value = invalid
-        if msg = ""
-          expr_as_string = Rooibos.Common.asString(value)
-          msg = expr_as_string + " = Invalid"
-        end if
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertAAHasKey
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the array doesn't have the key.
-    '  * @param {Dynamic} array - target array
-    '  * @param {Dynamic} key - key name
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertAAHasKey(array, key, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if Rooibos.Common.isAssociativeArray(array)
-        if not array.DoesExist(key)
-          if msg = ""
-            msg = "Array doesn't have the '" + key + "' key."
-          end if
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        end if
-      else
-        msg = "Input value is not an Associative Array."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertAANotHasKey
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the array has the key.
-    '  * @param {Dynamic} array - target array
-    '  * @param {Dynamic} key - key name
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertAANotHasKey(array, key, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if Rooibos.Common.isAssociativeArray(array)
-        if array.DoesExist(key)
-          if msg = ""
-            msg = "Array has the '" + key + "' key."
-          end if
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        end if
-      else
-        msg = "Input value is not an Associative Array."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertAAHasKeys
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the array doesn't have the keys list.
-    '  * @param {Dynamic} array - A target associative array.
-    '  * @param {Dynamic} keys - Array of key names.
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertAAHasKeys(array, keys, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if Rooibos.Common.isAssociativeArray(array) and Rooibos.Common.isArray(keys)
-        for each key in keys
-          if not array.DoesExist(key)
-            if msg = ""
-              msg = "Array doesn't have the '" + key + "' key."
-            end if
-            m.currentResult.addResult(msg)
-            return m.getLegacyCompatibleReturnValue(false)
-          end if
-        end for
-      else
-        msg = "Input value is not an Associative Array."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertAANotHasKeys
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the array has the keys list.
-    '  * @param {Dynamic} array - A target associative array.
-    '  * @param {Dynamic} keys - Array of key names.
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertAANotHasKeys(array, keys, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if Rooibos.Common.isAssociativeArray(array) and Rooibos.Common.isArray(keys)
-        for each key in keys
-          if array.DoesExist(key)
-            if msg = ""
-              msg = "Array has the '" + key + "' key."
-            end if
-            m.currentResult.addResult(msg)
-            return m.getLegacyCompatibleReturnValue(false)
-          end if
-        end for
-      else
-        msg = "Input value is not an Associative Array."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertArrayContains
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the array doesn't have the item.
-    '  * @param {Dynamic} array - target array
-    '  * @param {Dynamic} value - value to check - value to check for
-    '  * @param {Dynamic} key - key name in associative array
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertArrayContains(array, value, key = invalid, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if Rooibos.Common.isAssociativeArray(array) or Rooibos.Common.isArray(array)
-        if not Rooibos.Common.arrayContains(array, value, key)
-          msg = "Array doesn't have the '" + Rooibos.Common.asString(value) + "' value."
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        end if
-      else
-        msg = "Input value is not an Array."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertArrayContainsAAs
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the array does not contain all of the aa's in the values array.
-    '  * @param {Dynamic} array - target array
-    '  * @param {Dynamic} values - array of aas to look for in target array
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertArrayContainsAAs(array, values, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-
-      if not Rooibos.Common.isArray(values)
-        msg = "values to search for are not an Array."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-
-      if Rooibos.Common.isArray(array)
-        for each value in values
-          isMatched = false
-          if not Rooibos.Common.isAssociativeArray(value)
-            msg = "Value to search for was not associativeArray " + Rooibos.Common.asString(value)
-            m.currentResult.addResult(msg)
-            return m.getLegacyCompatibleReturnValue(false)
-          end if
-          for each item in array
-            if (Rooibos.Common.IsAssociativeArray(item))
-              isValueMatched = true
-              for each key in value
-                fieldValue = value[key]
-                itemValue = item[key]
-                if (not Rooibos.Common.eqValues(fieldValue, itemValue))
-                  isValueMatched = false
-                  exit for
-                end if
-              end for
-              if (isValueMatched)
-                isMatched = true
-                exit for
-              end if
-            end if
-          end for ' items in array
-
-          if not isMatched
-            msg = "array missing value: " + Rooibos.Common.asString(value)
-            m.currentResult.addResult(msg)
-            return m.getLegacyCompatibleReturnValue(false)
-          end if
-
-        end for 'values to match
-      else
-        msg = "Input value is not an Array."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertArrayNotContains
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the array has the item.
-    '  * @param {Dynamic} array - target array
-    '  * @param {Dynamic} array - target array
-    '  * @param {Dynamic} value - value to check - Value to check for
-    '  * @param {Dynamic} key - A key name for associative array.
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertArrayNotContains(array, value, key = invalid, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if Rooibos.Common.isAssociativeArray(array) or Rooibos.Common.isArray(array)
-        if Rooibos.Common.arrayContains(array, value, key)
-          msg = "Array has the '" + Rooibos.Common.asString(value) + "' value."
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        end if
-      else
-        msg = "Input value is not an Array."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertArrayContainsSubset
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the array doesn't have the item subset.
-    '  * @param {Dynamic} array - target array
-    '  * @param {Dynamic} subset - items to check presnece of
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertArrayContainsSubset(array, subset, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if (Rooibos.Common.isAssociativeArray(array) and Rooibos.Common.isAssociativeArray(subset)) or (Rooibos.Common.isArray(array) and Rooibos.Common.isArray(subset))
-        isAA = Rooibos.Common.isAssociativeArray(subset)
-        for each item in subset
-          key = invalid
-          value = item
-          if isAA
-            key = item
-            value = subset[key]
-          end if
-          if not Rooibos.Common.arrayContains(array, value, key)
-            msg = "Array doesn't have the '" + Rooibos.Common.asString(value) + "' value."
-            m.currentResult.addResult(msg)
-            return m.getLegacyCompatibleReturnValue(false)
-          end if
-        end for
-      else
-        msg = "Input value is not an Array."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertArrayNotContainsSubset
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the array have the item from subset.
-    '  * @param {Dynamic} array - target array
-    '  * @param {Dynamic} subset - items to check presnece of
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertArrayNotContainsSubset(array, subset, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if (Rooibos.Common.isAssociativeArray(array) and Rooibos.Common.isAssociativeArray(subset)) or (Rooibos.Common.isArray(array) and Rooibos.Common.isArray(subset))
-        isAA = Rooibos.Common.isAssociativeArray(subset)
-        for each item in subset
-          key = invalid
-          value = item
-          if isAA
-            key = item
-            value = item[key]
-          end if
-          if Rooibos.Common.arrayContains(array, value, key)
-            msg = "Array has the '" + Rooibos.Common.asString(value) + "' value."
-            m.currentResult.addResult(msg)
-            return m.getLegacyCompatibleReturnValue(false)
-          end if
-        end for
-      else
-        msg = "Input value is not an Array."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertArrayCount
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the array items count <> expected count
-    '  * @param {Dynamic} array - target array
-    '  * @param {Dynamic} count - An expected array items count
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertArrayCount(array, count, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if Rooibos.Common.isAssociativeArray(array) or Rooibos.Common.isArray(array)
-        if array.Count() <> count
-          msg = "Array items count " + Rooibos.Common.asString(array.Count()) + " <> " + Rooibos.Common.asString(count) + "."
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        end if
-      else
-        msg = "Input value is not an Array."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertArrayNotCount
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the array items count = expected count.
-    '  * @param {Dynamic} array - target array
-    '  * @param {Dynamic} count - An expected array items count.
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertArrayNotCount(array, count, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if Rooibos.Common.isAssociativeArray(array) or Rooibos.Common.isArray(array)
-        if array.Count() = count
-          msg = "Array items count = " + Rooibos.Common.asString(count) + "."
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        end if
-      else
-        msg = "Input value is not an Array."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertEmpty
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the item is not empty array or string.
-    '  * @param {Dynamic} item - item to check
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertEmpty(item, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if Rooibos.Common.isAssociativeArray(item) or Rooibos.Common.isArray(item)
-        if item.count() > 0
-          msg = "Array is not empty."
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        end if
-      else if (Rooibos.Common.isString(item))
-        if (Rooibos.Common.asString(item) <> "")
-          msg = "Input value is not empty."
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        end if
-      else
-        msg = "AssertEmpty: Input value was not an array or a string"
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertNotEmpty
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the item is empty array or string.
-    '  * @param {Dynamic} item - item to check
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertNotEmpty(item, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if Rooibos.Common.isAssociativeArray(item) or Rooibos.Common.isArray(item)
-        if item.count() = 0
-          msg = "Array is empty."
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        end if
-      else if Rooibos.Common.isString(item)
-        if (item = "")
-          msg = "Input value is empty."
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        end if
-      else
-        msg = "Input value is not a string or array."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertArrayContainsOnlyValuesOfType
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the array doesn't contains items of specific type only.
-    '  * @param {Dynamic} array - target array
-    '  * @param {Dynamic} typeStr - type name - must be String, Array, Boolean, or AssociativeArray
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertArrayContainsOnlyValuesOfType(array, typeStr, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if typeStr <> "String" and typeStr <> "Integer" and typeStr <> "Boolean" and typeStr <> "Array" and typeStr <> "AssociativeArray"
-        msg = "Type must be Boolean, String, Array, Integer, or AssociativeArray"
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-
-      if Rooibos.Common.isAssociativeArray(array) or Rooibos.Common.isArray(array)
-        methodName = "Rooibos_Common_Is" + typeStr
-        typeCheckFunction = m.getIsTypeFunction(methodName)
-        if (typeCheckFunction <> invalid)
-          for each item in array
-            if not typeCheckFunction(item)
-              msg = Rooibos.Common.asString(item) + "is not a '" + typeStr + "' type."
-              m.currentResult.addResult(msg)
-              return m.getLegacyCompatibleReturnValue(false)
-            end if
-          end for
-        else
-          msg = "could not find comparator for type '" + typeStr + "' type."
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        end if
-      else
-        msg = "Input value is not an Array."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    public function getIsTypeFunction(name)
-      if name = "Rooibos_Common_IsFunction"
-        return Rooibos.Common.isFunction
-      else if name = "Rooibos_Common_IsXmlElement"
-        return Rooibos.Common.isXmlElement
-      else if name = "Rooibos_Common_IsInteger"
-        return Rooibos.Common.isInteger
-      else if name = "Rooibos_Common_IsBoolean"
-        return Rooibos.Common.isBoolean
-      else if name = "Rooibos_Common_IsFloat"
-        return Rooibos.Common.isFloat
-      else if name = "Rooibos_Common_IsDouble"
-        return Rooibos.Common.isDouble
-      else if name = "Rooibos_Common_IsLongInteger"
-        return Rooibos.Common.isLongInteger
-      else if name = "Rooibos_Common_IsNumber"
-        return Rooibos.Common.isNumber
-      else if name = "Rooibos_Common_IsList"
-        return Rooibos.Common.isList
-      else if name = "Rooibos_Common_IsArray"
-        return Rooibos.Common.isArray
-      else if name = "Rooibos_Common_IsAssociativeArray"
-        return Rooibos.Common.isAssociativeArray
-      else if name = "Rooibos_Common_IsSGNode"
-        return Rooibos.Common.isSGNode
-      else if name = "Rooibos_Common_IsString"
-        return Rooibos.Common.isString
-      else if name = "Rooibos_Common_IsDateTime"
-        return Rooibos.Common.isDateTime
-      else if name = "Rooibos_Common_IsUndefined"
-        return Rooibos.Common.isUndefined
-      else
-        return invalid
-      end if
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertType
-    '  * @function
-    '  * @instance
-    '  * @description Asserts that the value is a node of designated type
-    '  * @param {Dynamic} value - value to check - target node
-    '  * @param {Dynamic} typeStr - type name
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertType(value, typeStr, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if type(value) <> typeStr
-        if msg = ""
-          expr_as_string = Rooibos.Common.asString(value)
-          msg = expr_as_string + " was not expected type " + typeStr
-        end if
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertSubType
-    '  * @function
-    '  * @instance
-    '  * @description Asserts that the value is a node of designated subtype
-    '  * @param {Dynamic} value - value to check - target node
-    '  * @param {Dynamic} typeStr - type name
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertSubType(value, typeStr, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if type(value) <> "roSGNode"
-        if msg = ""
-          expr_as_string = Rooibos.Common.asString(value)
-          msg = expr_as_string + " was not a node, so could not match subtype " + typeStr
-        end if
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      else if (value.subType() <> typeStr)
-        if msg = ""
-          expr_as_string = Rooibos.Common.asString(value)
-          msg = expr_as_string + "( type : " + value.subType() + ") was not of subType " + typeStr
-        end if
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-
-    '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-    '++ NEW NODE ASSERTS
-    '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertNodeCount
-    '  * @function
-    '  * @instance
-    '  * @description Asserts that the node contains the desginated number of children
-    '  * @param {Dynamic} node - target node
-    '  * @param {Dynamic} count - expected number of child items
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert w, false otherwise
-    '  */
-    public function assertNodeCount(node, count, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if type(node) = "roSGNode"
-        if node.getChildCount() <> count
-          msg = "node items count <> " + Rooibos.Common.asString(count) + ". Received " + Rooibos.Common.asString(node.getChildCount())
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        end if
-      else
-        msg = "Input value is not an node."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertNodeNotCount
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the node items count = expected count.
-    '  * @param {Dynamic} node - A target node
-    '  * @param {Dynamic} count - Expected item count
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertNodeNotCount(node, count, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if type(node) = "roSGNode"
-        if node.getChildCount() = count
-          msg = "node items count = " + Rooibos.Common.asString(count) + "."
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        end if
-      else
-        msg = "Input value is not an node."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertNodeEmpty
-    '  * @function
-    '  * @instance
-    '  * @description Asserts the node has no children
-    '  * @param {Dynamic} node - a node to check
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertNodeEmpty(node, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if type(node) = "roSGNode"
-        if node.getChildCount() > 0
-          msg = "node is not empty."
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        end if
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertNodeNotEmpty
-    '  * @function
-    '  * @instance
-    '  * @description Asserts the node has children
-    '  * @param {Dynamic} node - a node to check
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertNodeNotEmpty(node, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if type(node) = "roSGNode"
-        if node.Count() = 0
-          msg = "Array is empty."
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        end if
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertNodeContains
-    '  * @function
-    '  * @instance
-    '  * @description Asserts the node contains the child _value_
-    '  * @param {Dynamic} node - a node to check
-    '  * @param {Dynamic} value - value to check - value to look for
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertNodeContains(node, value, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if type(node) = "roSGNode"
-        if not Rooibos.Common.nodeContains(node, value)
-          msg = "Node doesn't have the '" + Rooibos.Common.asString(value) + "' value."
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        end if
-      else
-        msg = "Input value is not an Node."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertNodeContainsOnly
-    '  * @function
-    '  * @instance
-    '  * @description Asserts the node contains only the child _value_
-    '  * @param {Dynamic} node - a node to check
-    '  * @param {Dynamic} value - value to check - value to look for
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertNodeContainsOnly(node, value, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if type(node) = "roSGNode"
-        if not Rooibos.Common.nodeContains(node, value)
-          msg = "Node doesn't have the '" + Rooibos.Common.asString(value) + "' value."
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        else if node.getChildCount() <> 1
-          msg = "Node Contains speicified value; but other values as well"
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        end if
-      else
-        msg = "Input value is not an Node."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertNodeNotContains
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the node h item.
-    '  * @param {Dynamic} node - A target node
-    '  * @param {Dynamic} value - value to check - a node child
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertNodeNotContains(node, value, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if type(node) = "roSGNode"
-        if Rooibos.Common.nodeContains(node, value)
-          msg = "Node has the '" + Rooibos.Common.asString(value) + "' value."
-          m.currentResult.addResult(msg)
-          return m.getLegacyCompatibleReturnValue(false)
-        end if
-      else
-        msg = "Input value is not an Node."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertNodeContainsFields
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the node doesn't have the item subset.
-    '  * @param {Dynamic} node - A target node
-    '  * @param {Dynamic} subset - items to check
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertNodeContainsFields(node, subset, ignoredFields = invalid, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if (type(node) = "roSGNode" and Rooibos.Common.isAssociativeArray(subset)) or (type(node) = "roSGNode" and Rooibos.Common.isArray(subset))
-        isAA = Rooibos.Common.isAssociativeArray(subset)
-        isIgnoredFields = Rooibos.Common.isArray(ignoredFields)
-        for each key in subset
-          if (key <> "")
-            if (not isIgnoredFields or not Rooibos.Common.arrayContains(ignoredFields, key))
-              subsetValue = subset[key]
-              nodeValue = node[key]
-              if not Rooibos.Common.eqValues(nodeValue, subsetValue)
-                msg = key + ": Expected '" + Rooibos.Common.asString(subsetValue) + "', got '" + Rooibos.Common.asString(nodeValue) + "'"
-                m.currentResult.addResult(msg)
-                return m.getLegacyCompatibleReturnValue(false)
-              end if
-            end if
-          else
-            ? "Found empty key!"
-          end if
-        end for
-      else
-        msg = "Input value is not an Node."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertNodeNotContainsFields
-    '  * @function
-    '  * @instance
-    '  * @description Fail if the node have the item from subset.
-    '  * @param {Dynamic} node - A target node
-    '  * @param {Dynamic} subset - the items to check for
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert w, false otherwise
-    ' */
-    public function assertNodeNotContainsFields(node, subset, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if (type(node) = "roSGNode" and Rooibos.Common.isAssociativeArray(subset)) or (type(node) = "roSGNode" and Rooibos.Common.isArray(subset))
-        isAA = Rooibos.Common.isAssociativeArray(subset)
-        for each item in subset
-          key = invalid
-          value = item
-          if isAA
-            key = item
-            value = item[key]
-          end if
-          if Rooibos.Common.nodeContains(node, value)
-            msg = "Node has the '" + Rooibos.Common.asString(value) + "' value."
-            m.currentResult.addResult(msg)
-            return m.getLegacyCompatibleReturnValue(false)
-          end if
-        end for
-      else
-        msg = "Input value is not an Node."
-        m.currentResult.addResult(msg)
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-    '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-    '++ END NODE ASSERTS
-    '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertAAContainsSubset
-    '  * @function
-    '  * @instance
-    '  * @description Asserts the associative array contains the fields contained in subset; while ignoring the fields in the ignoredFields array
-    '  * @param {Dynamic} array - associative array  to check
-    '  * @param {Dynamic} subset - associative array of values to check for
-    '  * @param {Dynamic} ignoredFields - array of fieldnames to ignore while comparing
-    '  * @param {Dynamic} [msg=""] - alternate error message
-    '  * @returns {boolean} - true if the assert was satisfied, false otherwise
-    '  */
-    public function assertAAContainsSubset(array, subset, ignoredFields = invalid, msg = "") as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if (Rooibos.Common.isAssociativeArray(array) and Rooibos.Common.isAssociativeArray(subset))
-        isAA = Rooibos.Common.isAssociativeArray(subset)
-        isIgnoredFields = Rooibos.Common.isArray(ignoredFields)
-        for each key in subset
-          if (key <> "")
-            if (not isIgnoredFields or not Rooibos.Common.arrayContains(ignoredFields, key))
-              subsetValue = subset[key]
-              arrayValue = array[key]
-              if not Rooibos.Common.eqValues(arrayValue, subsetValue)
-                msg = key + ": Expected '" + Rooibos.Common.asString(subsetValue) + "', got '" + Rooibos.Common.asString(arrayValue) + "'"
-                m.currentResult.addResult(msg)
-                return m.getLegacyCompatibleReturnValue(false)
-              end if
-            end if
-          else
-            ? "Found empty key!"
-          end if
-        end for
-      else
-        msg = "Input values are not an Associative Array."
-
-        return m.getLegacyCompatibleReturnValue(false)
-      end if
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-
-    '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-    '++ Stubbing helpers
-    '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name stub
-    '  * @function
-    '  * @instance
-    '  * @description Creates a stub to replace a real method with
-    '  * @param {Dynamic} target - object on which the method to be stubbed is found
-    '  * @param {Dynamic} methodName - name of method to stub
-    '  * @param {Dynamic} [returnValue=invalid] - value that the stub method will return when invoked
-    '  * @param {boolean} [allowNonExistingMethods=false] - if true, then rooibos will only warn if the method did not exist prior to faking
-    '  * @returns {Object} - stub that was wired into the real method
-    '  */
-    public function stub(target, methodName, returnValue = invalid, allowNonExistingMethods = false) as object
-      if (type(target) <> "roAssociativeArray")
-        m.fail("could not create Stub provided target was null")
-        return {}
-      end if
-
-      if (m.stubs = invalid)
-        m.__stubId = -1
-        m.stubs = {}
-      end if
-      m.__stubId++
-
-      if (m.__stubId > 5)
-        ? "ERROR ONLY 6 STUBS PER TEST ARE SUPPORTED!!"
-        return invalid
-      end if
-
-      id = stri(m.__stubId).trim()
-
-      fake = m.createFake(id, target, methodName, 1, invalid, returnValue)
-      m.stubs[id] = fake
-      allowNonExisting = m.allowNonExistingMethodsOnMocks = true or allowNonExistingMethods
-      isMethodPresent = type(target[methodName]) = "Function" or type(target[methodName]) = "roFunction"
-      if (isMethodPresent or allowNonExisting)
-        target[methodName] = m["StubCallback" + id]
-        target.__stubs = m.stubs
-
-        if (not isMethodPresent)
-          ? "WARNING - stubbing call " ; methodName; " which did not exist on target object"
-        end if
-      else
-        ? "ERROR - could not create Stub : method not found  "; target ; "." ; methodName
-      end if
-
-      return fake
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name expectOnce
-    '  * @function
-    '  * @instance
-    '  * @description Creates a stub to replace a real method with, which the framework will track. If it was invoked the wrong number of times, or with wrong arguments, it will result in test failure
-    '  * @param {Dynamic} target - object on which the method to be stubbed is found
-    '  * @param {Dynamic} methodName - name of method to stub
-    '  * @param {Dynamic} [expectedArgs=invalid] - array containing the arguments we expect the method to be invoked with
-    '  * @param {Dynamic} [returnValue=invalid] - value that the stub method will return when invoked
-    '  * @param {boolean} [allowNonExistingMethods=false] - if true, then rooibos will only warn if the method did not exist prior to faking
-    '  * @returns {Object} - mock that was wired into the real method
-    '  */
-    public function expectOnce(target, methodName, expectedArgs = invalid, returnValue = invalid, allowNonExistingMethods = false) as object
-      return m.mock(target, methodName, 1, expectedArgs, returnValue, allowNonExistingMethods)
-    end function
-
-    public function expectOnceWLN(lineNumber, target, methodName, expectedArgs = invalid, returnValue = invalid, allowNonExistingMethods = false) as object
-      return m.mock(target, methodName, 1, expectedArgs, returnValue, allowNonExistingMethods, lineNumber)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name expectOnceOrNone
-    '  * @function
-    '  * @instance
-    '  * @description Toggles between expectOnce and expectNone, to allow for easy paremeterized expect behaviour
-    '  * @param {Dynamic} target - object on which the method to be stubbed is found
-    '  * @param {Dynamic} methodName - name of method to stub
-    '  * @param {Dynamic} isExpected - if true, then this is the same as expectOnce, if false, then this is the same as expectNone
-    '  * @param {Dynamic} [expectedArgs=invalid] - array containing the arguments we expect the method to be invoked with
-    '  * @param {Dynamic} [returnValue=invalid] - value that the stub method will return when invoked
-    '  * @param {boolean} [allowNonExistingMethods=false] - if true, then rooibos will only warn if the method did not exist prior to faking
-    '  * @returns {Object} - mock that was wired into the real method
-    '  */
-    public function expectOnceOrNone(target, methodName, isExpected, expectedArgs = invalid, returnValue = invalid, allowNonExistingMethods = false) as object
-      if isExpected
-        return m.expectOnce(target, methodName, expectedArgs, returnValue, allowNonExistingMethods)
-      else
-        return m.expectNone(target, methodName, allowNonExistingMethods)
-      end if
-    end function
-
-    public function expectOnceOrNoneWLN(lineNumber, target, methodName, isExpected, expectedArgs = invalid, returnValue = invalid, allowNonExistingMethods = false) as object
-      if isExpected
-        return m.expectOnceWLN(lineNumber, target, methodName, expectedArgs, returnValue, allowNonExistingMethods)
-      else
-        return m.expectNoneWLN(lineNumber, target, methodName, allowNonExistingMethods)
-      end if
-    end function
-
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name expectNone
-    '  * @function
-    '  * @instance
-    '  * @description Creates a stub to replace a real method with, which the framework will track. If it was invoked, it will result in test failure
-    '  * @param {Dynamic} target - object on which the method to be stubbed is found
-    '  * @param {Dynamic} methodName - name of method to stub
-    '  * @param {boolean} [allowNonExistingMethods=false] - if true, then rooibos will only warn if the method did not exist prior to faking
-    '  * @returns {Object} - mock that was wired into the real method
-    '  */
-    public function expectNone(target, methodName, allowNonExistingMethods = false) as object
-      return m.mock(target, methodName, 0, invalid, invalid, allowNonExistingMethods)
-    end function
-
-    public function expectNoneWLN(lineNumber, target, methodName, allowNonExistingMethods = false) as object
-      return m.mock(target, methodName, 0, invalid, invalid, allowNonExistingMethods, lineNumber)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name expect
-    '  * @function
-    '  * @instance
-    '  * @description Creates a stub to replace a real method with, which the framework will track. If it was invoked the wrong number of times, or with wrong arguments, it will result in test failure
-    '  * @param {Dynamic} target - object on which the method to be stubbed is found
-    '  * @param {Dynamic} methodName - name of method to stub
-    '  * @param {Dynamic} [expectedInvocations=1] - number of invocations we expect
-    '  * @param {Dynamic} [expectedArgs=invalid] - array containing the arguments we expect the method to be invoked with
-    '  * @param {Dynamic} [returnValue=invalid] - value that the stub method will return when invoked
-    '  * @param {boolean} [allowNonExistingMethods=false] - if true, then rooibos will only warn if the method did not exist prior to faking
-    '  * @returns {Object} - mock that was wired into the real method
-    '  */
-    public function expect(target, methodName, expectedInvocations = 1, expectedArgs = invalid, returnValue = invalid, allowNonExistingMethods = false) as object
-      return m.mock(target, methodName, expectedInvocations, expectedArgs, returnValue, allowNonExistingMethods)
-    end function
-
-    public function expectWLN(lineNumber, target, methodName, expectedInvocations = 1, expectedArgs = invalid, returnValue = invalid, allowNonExistingMethods = false) as object
-      return m.mock(target, methodName, expectedInvocations, expectedArgs, returnValue, allowNonExistingMethods, lineNumber)
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name mock
-    '  * @function
-    '  * @instance
-    '  * @description Creates a stub to replace a real method with, which the framework will track. If it was invoked the wrong number of times, or with wrong arguments, it will result in test failure
-    '  * @param {Dynamic} target - object on which the method to be stubbed is found
-    '  * @param {Dynamic} methodName - name of method to stub
-    '  * @param {Dynamic} expectedInvocations - number of invocations we expect
-    '  * @param {Dynamic} [expectedArgs=invalid] - array containing the arguments we expect the method to be invoked with
-    '  * @param {Dynamic} [returnValue=invalid] - value that the stub method will return when invoked
-    '  * @param {boolean} [allowNonExistingMethods=false] - if true, then rooibos will only warn if the method did not exist prior to faking
-    '  * @returns {Object} - mock that was wired into the real method
-    '  */
-    public function mock(target, methodName, expectedInvocations = 1, expectedArgs = invalid, returnValue = invalid, allowNonExistingMethods = false, lineNumber = -1) as object
-      'check params
-      if not Rooibos.Common.isAssociativeArray(target)
-        methodName = ""
-        m.mockFail(lineNumber, "", "mock args: target was not an AA")
-      else if not Rooibos.Common.isString(methodName)
-        methodName = ""
-        m.mockFail(lineNumber, "", "mock args: methodName was not a string")
-      else if not Rooibos.Common.isNumber(expectedInvocations)
-        m.mockFail(lineNumber, methodName, "mock args: expectedInvocations was not an int")
-      else if not Rooibos.Common.isArray(expectedArgs) and Rooibos.Common.isValid(expectedArgs)
-        m.mockFail(lineNumber, methodName, "mock args: expectedArgs was not invalid or an array of args")
-      else if Rooibos.Common.isUndefined(expectedArgs)
-        m.mockFail(lineNumber, methodName, "mock args: expectedArgs undefined")
-      else if Rooibos.Common.isUndefined(returnValue)
-        m.mockFail(lineNumber, methodName, "mock args: returnValue undefined")
-      end if
-
-      if m.currentResult.isFail
-        ? "ERROR! Cannot create MOCK. method " ; methodName ;" " str(lineNumber) ; " "; m.currentResult.messages.peek()
-        return {}
-      end if
-
-      if (m.mocks = invalid)
-        m.__mockId = -1
-        m.__mockTargetId = -1
-        m.mocks = {}
-      end if
-
-      fake = invalid
-      if not target.doesExist("__rooibosTargetId")
-        m.__mockTargetId++
-        target["__rooibosTargetId"] = m.__mockTargetId
-      end if
-      'ascertain if mock already exists
-      for i = 0 to m.__mockId
-        id = stri(i).trim()
-        mock = m.mocks[id]
-        if mock <> invalid and mock.methodName = methodName and mock.target.__rooibosTargetId = target.__rooibosTargetId
-          fake = mock
-          fake.lineNumbers.push(lineNumber)
-          exit for
-        end if
-      end for
-      if fake = invalid
-        m.__mockId++
-        id = stri(m.__mockId).trim()
-        if (m.__mockId > 25)
-          ? "ERROR ONLY 25 MOCKS PER TEST ARE SUPPORTED!! you're on # " ; m.__mockId
-          ? " Method was " ; methodName
-          return invalid
-        end if
-
-        fake = m.createFake(id, target, methodName, expectedInvocations, expectedArgs, returnValue, lineNumber)
-        m.mocks[id] = fake 'this will bind it to m
-        allowNonExisting = m.allowNonExistingMethodsOnMocks = true or allowNonExistingMethods
-        isMethodPresent = type(target[methodName]) = "Function" or type(target[methodName]) = "roFunction"
-        if (isMethodPresent or allowNonExisting)
-          target[methodName] = m["MockCallback" + id]
-          target.__mocks = m.mocks
-
-          if (not isMethodPresent)
-            ? "WARNING - mocking call " ; methodName; " which did not exist on target object"
-          end if
-        else
-          ? "ERROR - could not create Mock : method not found  "; target ; "." ; methodName
-        end if
-      else
-        m.combineFakes(fake, m.createFake(id, target, methodName, expectedInvocations, expectedArgs, returnValue, lineNumber))
-      end if
-      return fake
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name createFake
-    '  * @function
-    '  * @instance
-    '  * @description Creates a stub to replace a real method with. This is used internally.
-    '  * @param {Dynamic} target - object on which the method to be stubbed is found
-    '  * @param {Dynamic} methodName - name of method to stub
-    '  * @param {Dynamic} [expectedInvocations=1] - number of invocations we expect
-    '  * @param {Dynamic} [expectedArgs=invalid] - array containing the arguments we expect the method to be invoked with
-    '  * @param {Dynamic} [returnValue=invalid] - value that the stub method will return when invoked
-    '  * @returns {Object} - stub that was wired into the real method
-    '  */
-    public function createFake(id, target, methodName, expectedInvocations = 1, expectedArgs = invalid, returnValue = invalid, lineNumber = -1) as object
-      expectedArgsValues = []
-      hasArgs = Rooibos.Common.isArray(expectedArgs)
-      if (hasArgs)
-        defaultValue = m.invalidValue
-      else
-        defaultValue = m.ignoreValue
-        expectedArgs = []
-      end if
-      lineNumbers = [lineNumber]
-
-      for i = 0 to 9
-        if (hasArgs and expectedArgs.count() > i)
-          'guard against bad values 
-          value = expectedArgs[i]
-          if not Rooibos.Common.isUndefined(value)
-            if Rooibos.Common.isAssociativeArray(value) and Rooibos.Common.isValid(value.matcher)
-              if not Rooibos.Common.isFunction(value.matcher)
-                ? "[ERROR] you have specified a matching function; but it is not in scope!"
-                expectedArgsValues.push("#ERR-OUT_OF_SCOPE_MATCHER!")
-              else
-                expectedArgsValues.push(expectedArgs[i])
-              end if
-            else
-              expectedArgsValues.push(expectedArgs[i])
-            end if
-          else
-            expectedArgsValues.push("#ERR-UNDEFINED!")
-          end if
-        else
-          expectedArgsValues.push(defaultValue)
-        end if
-      end for
-      fake = {
-        id : id,
-        target: target,
-        methodName: methodName,
-        returnValue: returnValue,
-        lineNumbers: lineNumbers,
-        isCalled: false,
-        invocations: 0,
-        invokedArgs: [invalid, invalid, invalid, invalid, invalid, invalid, invalid, invalid, invalid],
-        expectedArgs: expectedArgsValues,
-        expectedInvocations: expectedInvocations,
-        callback: function(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-          ' ? "FAKE CALLBACK CALLED FOR " ; m.methodName
-          if (m.allInvokedArgs = invalid)
-            m.allInvokedArgs = []
-          end if
-          m.invokedArgs = [arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9]
-          m.allInvokedArgs.push ([arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9])
-          m.isCalled = true
-          m.invocations++
-
-          if (type(m.returnValue) = "roAssociativeArray" and m.returnValue.doesExist("multiResult"))
-            returnValues = m.returnValue["multiResult"]
-            returnIndex = m.invocations - 1
-
-            if (type(returnValues) = "roArray" and returnValues.count() > 0)
-
-              if returnValues.count() <= m.invocations
-                returnIndex = returnValues.count() - 1
-                print "Multi return values all used up - repeating last value"
-              end if
-              return returnValues[returnIndex]
-            else
-              ? "Multi return value was specified; but no array of results were found"
-              return invalid
-            end if
-          else
-            return m.returnValue
-          end if
-        end function
-      }
-      return fake
-    end function
-
-    public function combineFakes(fake, otherFake)
-      'add on the expected invoked args
-      if type(fake.expectedArgs) <> "roAssociativeArray" or not fake.expectedArgs.doesExist("multiInvoke")
-        currentExpectedArgsArgs = fake.expectedArgs
-        fake.expectedArgs = {
-          "multiInvoke": [currentExpectedArgsArgs]
-        }
-      end if
-      fake.expectedArgs.multiInvoke.push(otherFake.expectedArgs)
-
-      'add on the expected return values
-      if type(fake.returnValue) <> "roAssociativeArray" or not fake.returnValue.doesExist("multiResult")
-        currentReturnValue = fake.returnValue
-        fake.returnValue = {
-          "multiResult": [currentReturnValue]
-        }
-      end if
-      fake.returnValue.multiResult.push(otherFake.returnValue)
-      fake.lineNumbers.push(lineNumber)
-      fake.expectedInvocations++
-    end function
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name assertMocks
-    '  * @function
-    '  * @instance
-    '  * @description Will check all mocks that have been created to ensure they were invoked the expected amount of times, with the expected args.
-    '  */
-    public function assertMocks() as void
-      if (m.__mockId = invalid or not Rooibos.Common.isAssociativeArray(m.mocks))
-        return
-      end if
-
-      lastId = int(m.__mockId)
-      for each id in m.mocks
-        mock = m.mocks[id]
-        methodName = mock.methodName
-        if (mock.expectedInvocations <> mock.invocations)
-          m.mockFail(mock.lineNumbers[0], methodName, "Wrong number of calls. (" + stri(mock.invocations).trim() + " / " + stri(mock.expectedInvocations).trim() + ")")
-          m.cleanMocks()
-          return
-        else if mock.expectedInvocations > 0 and (Rooibos.Common.isArray(mock.expectedArgs) or (type(mock.expectedArgs) = "roAssociativeArray" and Rooibos.Common.isArray(mock.expectedArgs.multiInvoke)))
-          isMultiArgsSupported = type(mock.expectedArgs) = "roAssociativeArray" and Rooibos.Common.isArray(mock.expectedArgs.multiInvoke)
-
-          for invocationIndex = 0 to mock.invocations - 1
-            invokedArgs = mock.allInvokedArgs[invocationIndex]
-            if isMultiArgsSupported
-              expectedArgs = mock.expectedArgs.multiInvoke[invocationIndex]
-            else
-              expectedArgs = mock.expectedArgs
-            end if
-            for i = 0 to expectedArgs.count() - 1
-              value = invokedArgs[i]
-              expected = expectedArgs[i]
-              didNotExpectArg = Rooibos.Common.isString(expected) and expected = m.invalidValue
-              if (didNotExpectArg)
-                expected = invalid
-              end if
-
-              isUsingMatcher = Rooibos.Common.isAssociativeArray(expected) and Rooibos.Common.isFunction(expected.matcher)
-
-              if isUsingMatcher
-                if not expected.matcher(value)
-                  m.mockFail(mock.lineNumbers[invocationIndex], methodName, "on Invocation #" + stri(invocationIndex).trim() + ", expected arg #" + stri(i).trim() + "  to match matching function '" + Rooibos.Common.asString(expected.matcher) + "' got '" + Rooibos.Common.asString(value) + "')")
-                  m.cleanMocks()
-                end if
-              else
-                if (not (Rooibos.Common.isString(expected) and expected = m.ignoreValue) and not Rooibos.Common.eqValues(value, expected))
-                  if (expected = invalid)
-                    expected = "[INVALID]"
-                  end if
-
-                  m.mockFail(mock.lineNumbers[invocationIndex], methodName, "on Invocation #" + stri(invocationIndex).trim() + ", expected arg #" + stri(i).trim() + "  to be '" + Rooibos.Common.asString(expected) + "' got '" + Rooibos.Common.asString(value) + "')")
-                  m.cleanMocks()
-                  return
-                end if
-              end if
-            end for
-          end for
-        end if
-      end for
-
-      m.cleanMocks()
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name cleanMocks
-    '  * @function
-    '  * @instance
-    '  * @description Cleans up all tracking data associated with mocks
-    '  */
-    public function cleanMocks() as void
-      if m.mocks = invalid then return
-      for each id in m.mocks
-        mock = m.mocks[id]
-        mock.target.__mocks = invalid
-      end for
-      m.mocks = invalid
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name cleanStubs
-    '  * @function
-    '  * @instance
-    '  * @description Cleans up all tracking data associated with stubs
-    '  */
-    public function cleanStubs() as void
-      if m.stubs = invalid then return
-      for each id in m.stubs
-        stub = m.stubs[id]
-        stub.target.__stubs = invalid
-      end for
-      m.stubs = invalid
-    end function
-
-
-    public function mockFail(lineNumber, methodName, message) as dynamic
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      m.currentResult.addMockResult(lineNumber, "mock failure on '" + methodName + "' : " + message)
-      return m.getLegacyCompatibleReturnValue(false)
-    end function
-
-
-    '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-    '++ Fake Stub callback functions - this is required to get scope
-    '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-    public function stubCallback0(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__Stubs["0"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function stubCallback1(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__Stubs["1"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function stubCallback2(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__Stubs["2"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-
-    public function stubCallback3(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__Stubs["3"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-
-    public function stubCallback4(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__Stubs["4"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-
-    public function stubCallback5(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__Stubs["5"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-    '++ Fake Mock callback functions - this is required to get scope
-    '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-    public function mockCallback0(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["0"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback1(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["1"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback2(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["2"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback3(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["3"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback4(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["4"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback5(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["5"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback6(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["6"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback7(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["7"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback8(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["8"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback9(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["9"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback10(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["10"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback11(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["11"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback12(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["12"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback13(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["13"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback14(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["14"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback15(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["15"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback16(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["16"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback17(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["17"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback18(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["18"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback19(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["19"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback20(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["20"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback21(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["21"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback22(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["22"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback23(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["23"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-    public function mockCallback24(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
-      fake = m.__mocks["24"]
-      return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-    end function
-
-
-    '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-    '++ Utility functions!
-    '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-    '*************************************************************
-    '** ripped and adapted from rodash - thanks @veeta!
-    '** used by get method - consider thsis private
-    '*************************************************************
-    public function pathAsArray_(path)
-      pathRE = CreateObject("roRegex", "\[([0-9]+)\]", "i")
-      segments = []
-      if type(path) = "String" or type(path) = "roString"
-        dottedPath = pathRE.replaceAll(path, ".\1")
-        stringSegments = dottedPath.tokenize(".")
-        for each s in stringSegments
-          if (Asc(s) >= 48) and (Asc(s) <= 57)
-            segments.push(s.toInt())
-          else
-            segments.push(s)
-          end if
-        end for
-      else if type(path) = "roList" or type(path) = "roArray"
-        stringPath = ""
-        for each s in path
-          stringPath = stringPath + "." + Box(s).toStr()
-        end for
-        segments = m.pathAsArray_(stringPath)
-      else
-        segments = invalid
-      end if
-      return segments
-    end function
-
-    ' /**
-    '  * @memberof module:BaseTestSuite
-    '  * @name g
-    '  * @function
-    '  * @instance
-    '  * @description ripped and adapted from rodash - thanks @veeta!
-    '  * use this method to safely get anything. useful for when unit testing a collection
-    '  * or something and you're not sure if it's gonna crash!
-    '  * @param {Dynamic} aa - node, array or assoArray
-    '  * @param {Dynamic} subset - the items to check for
-    '  * @param {Dynamic} path -as string path to target field. Can use .0. or [0] index notation e.g. "children.0.title" or "children[0].title"
-    '  * @returns {dynamic} - matched item, on aa at path
-    ' */
-
-    public function g(aa, path, default = invalid)
-      if type(aa) <> "roAssociativeArray" and type(aa) <> "roArray" and type(aa) <> "roSGNode" then return default
-      segments = m.pathAsArray_(path)
-
-      if (Type(path) = "roInt" or Type(path) = "roInteger" or Type(path) = "Integer")
-        path = stri(path).trim()
-      end if
-
-      if segments = invalid then return default
-      result = invalid
-
-      while segments.count() > 0
-        key = segments.shift()
-        if (type(key) = "roInteger") 'it's a valid index
-          if (aa <> invalid and GetInterface(aa, "ifArray") <> invalid)
-            value = aa[key]
-          else if (aa <> invalid and GetInterface(aa, "ifSGNodeChildren") <> invalid)
-            value = aa.getChild(key)
-          else if (aa <> invalid and GetInterface(aa, "ifAssociativeArray") <> invalid)
-            key = str(key)
-            if not aa.doesExist(key)
-              exit while
-            end if
-
-            value = aa.lookup(key)
-          else
-            value = invalid
-          end if
-        else
-          if not aa.doesExist(key)
-            exit while
-          end if
-
-          value = aa.lookup(key)
-        end if
-
-        if segments.count() = 0
-          result = value
-          exit while
-        end if
-
-        if type(value) <> "roAssociativeArray" and type(value) <> "roArray" and type(value) <> "roSGNode"
-          exit while
-        end if
-        aa = value
-      end while
-
-      if result = invalid then return default
-      return result
-    end function
-
-    '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-    '++ crude async support
-    '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-    ' /**
-    '  * @member waitForField
-    '  * @memberof module:TestUtils
-    '  * @instance
-    '  * @function
-    '  * @description observeField doesn't work in regular unit tests, so we have to wait for the result. We can use this to wait for a network task, foe example, and pass the result directly to a handler. Note - we wait for the value TO CHANGE - so make sure that will be the case, or you'll get stuck forever :)
-    '  * @param {any} target to observe
-    '  * @param {string} field to observe
-    '  * @param {int} delay for each wait
-    '  * @param {int} max attempts
-    '  */
-    function waitForField(target, fieldName, delay = 500, maxAttempts = 10)
-      attempts = 0
-      if target = invalid
-        return false
-      end if
-
-      initialValue = target[fieldName]
-      while target[fieldName] = initialValue
-        port = CreateObject("roMessagePort")
-        wait(delay, port)
-        attempts++
-        if attempts = maxAttempts
-          return false
-        end if
-        ? "waiting for signal field '" ; fieldName "' - " ; attempts
-      end while
-
-      return true
-    end function
-
-    public function assertAsyncField(target, fieldName, delay = 500, maxAttempts = 10)
-      if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
-      if target = invalid
-        m.fail("Target was invalid")
-      end if
-
-      result = m.waitForField(target, fieldName, delay, maxAttempts)
-      if not result
-        return m.fail("Timeout waiting for targetField " + fieldName + " to be set on target")
-      end if
-
-      m.currentResult.addResult("")
-      return m.getLegacyCompatibleReturnValue(true)
-    end function
-
-  end class
-end namespace
\ No newline at end of file
diff --git a/src/ItGroup.bs b/src/ItGroup.bs
deleted file mode 100644
index b20961cf..00000000
--- a/src/ItGroup.bs
+++ /dev/null
@@ -1,39 +0,0 @@
-namespace Rooibos.ItGroup
-
-  function getTestCases(group) as object
-    if (group.hasSoloTests = true)
-      return group.soloTestCases
-    else
-      return group.testCases
-    end if
-  end function
-
-  function getRunnableTestSuite(group) as object
-    testCases = Rooibos.ItGroup.getTestCases(group)
-
-    runnableSuite = new Rooibos.BaseTestSuite()
-    runnableSuite.name = group.name
-    runnableSuite.isLegacy = group.isLegacy = true
-    if group.testCaseLookup = invalid
-      group.testCaseLookup = {}
-    end if
-
-    for each testCase in testCases
-      name = testCase.name
-      if (testCase.isSolo = true)
-        name = name + " [SOLO] "
-      end if
-      testFunction = Rooibos.Common.getFunction(group.filename, testCase.funcName)
-      runnableSuite.addTest(name, testFunction, testCase.funcName)
-      group.testCaseLookup[name] = testCase
-    end for
-
-    runnableSuite.SetUp = Rooibos.Common.getFunction(group.filename, group.setupFunctionName)
-    runnableSuite.TearDown = Rooibos.Common.getFunction(group.filename, group.teardownFunctionName)
-    runnableSuite.BeforeEach = Rooibos.Common.getFunction(group.filename, group.beforeEachFunctionName)
-    runnableSuite.AfterEach = Rooibos.Common.getFunction(group.filename, group.afterEachFunctionName)
-
-    return runnableSuite
-  end function
-
-end namespace
\ No newline at end of file
diff --git a/src/ItemGenerator.bs b/src/ItemGenerator.bs
deleted file mode 100644
index 802d857b..00000000
--- a/src/ItemGenerator.bs
+++ /dev/null
@@ -1,211 +0,0 @@
-namespace Rooibos
-  ' /**
-  '  * @module ItemGenerator
-  '  */
-
-  ' /**
-  '  * @memberof module:ItemGenerator
-  '  * @name ItemGenerator
-  '  * @function
-  '  * @instance
-  '  * @param {Dynamic} scheme  - A scheme with desired object structure. Can be
-  '  * any simple type, array of types or associative array in form
-  '  *
-  '  * ``` { propertyName1 : "propertyType1"
-  '  *   propertyName2 : "propertyType2"
-  '  *   ...
-  '  *   propertyNameN : "propertyTypeN" }
-  '  * ```
-  '  * @description Creates an ItemGenerator instance
-  '  * @returns {Object} An object according to specified scheme or invalid, if scheme is not valid.
-  '  */
-  class ItemGenerator
-
-    public function new()
-      m.isValid = Rooibos.Common.isValid(scheme)
-    end function
-
-    ' /**
-    '  * @memberof module:ItemGenerator
-    '  * @name GetItem
-    '  * @function
-    '  * @instance
-    '  * @param {Dynamic} scheme  - A scheme with desired object structure. Can be
-    '  * any simple type, array of types or associative array in form
-    '  *
-    '  * ``` { propertyName1 : "propertyType1"
-    '  *   propertyName2 : "propertyType2"
-    '  *   ...
-    '  *   propertyNameN : "propertyTypeN" }
-    '  * ```
-    '  * @description Gets an item according to the schem
-    '  * @returns {Object}  An object according to specified scheme or invalid if scheme is not one of simple type, array or associative array.
-    '  */
-    public function GetItem(scheme as object) as object
-
-      item = invalid
-
-      if Rooibos.Common.isAssociativeArray(scheme)
-        item = m.getAssocArray(scheme)
-      else if Rooibos.Common.isArray(scheme)
-        item = m.getArray(scheme)
-      else if Rooibos.Common.isString(scheme)
-        item = m.getSimpleType(lCase(scheme))
-      end if
-
-      return item
-    end function
-
-    ' /**
-    '  * @memberof module:ItemGenerator
-    '  * @name GetAssocArray
-    '  * @function
-    '  * @instance
-    '  * @param {Dynamic} scheme  - A scheme with desired object structure. Can be
-    '  * any simple type, array of types or associative array in form
-    '  *
-    '  * ``` { propertyName1 : "propertyType1"
-    '  *   propertyName2 : "propertyType2"
-    '  *   ...
-    '  *   propertyNameN : "propertyTypeN" }
-    '  * ```
-    '  * @description Generates associative array according to specified scheme.
-    '  * @returns {Object} An associative array according to specified scheme.
-    '  */
-    public function GetAssocArray(scheme as object) as object
-
-      item = {}
-
-      for each key in scheme
-        if not item.DoesExist(key)
-          item[key] = m.getItem(scheme[key])
-        end if
-      end for
-
-      return item
-    end function
-
-    ' /**
-    '  * @memberof module:ItemGenerator
-    '  * @name GetArray
-    '  * @function
-    '  * @instance
-    '  * @param {Dynamic} An array with desired object types.
-    '  *
-    '  * ``` { propertyName1 : "propertyType1"
-    '  *   propertyName2 : "propertyType2"
-    '  *   ...
-    '  *   propertyNameN : "propertyTypeN" }
-    '  * ```
-    '  * @description Generates array according to specified scheme.
-    '  * @returns {Object} An array according to specified scheme.
-    '  */
-    public function GetArray(scheme as object) as object
-
-      item = []
-
-      for each key in scheme
-        item.Push(m.getItem(key))
-      end for
-
-      return item
-    end function
-
-    ' /**
-    '  * @memberof module:ItemGenerator
-    '  * @name GetSimpleType
-    '  * @function
-    '  * @instance
-    '  * @description Generates random value of specified type
-    '  * @param {Dynamic} typeStr - name of desired object type.
-    '  * @returns {Object} A simple type object or invalid if type is not supported.
-    '  */
-    public function GetSimpleType(typeStr as string) as object
-
-      item = invalid
-
-      if typeStr = "integer" or typeStr = "int" or typeStr = "roint"
-        item = m.getInteger()
-      else if typeStr = "float" or typeStr = "rofloat"
-        item = m.getFloat()
-      else if typeStr = "string" or typeStr = "rostring"
-        item = m.getString(10)
-      else if typeStr = "boolean" or typeStr = "roboolean"
-        item = m.getBoolean()
-      end if
-
-      return item
-    end function
-
-    ' /**
-    '  * @memberof module:ItemGenerator
-    '  * @name GetBoolean
-    '  * @function
-    '  * @instance
-    '  * @description Generates random boolean value.
-    '  * @returns {Boolean} A random boolean value.
-    '  */
-    public function GetBoolean() as boolean
-      return Rooibos.Common.asBoolean(Rnd(2) \ Rnd(2))
-    end function
-
-    ' /**
-    '  * @memberof module:ItemGenerator
-    '  * @name GetInteger
-    '  * @function
-    '  * @instance
-    '  * @description Generates random integer value from 1 to specified seed value.
-    '  * @param {Dynamic} seed - seed value for Rnd function.
-    '  * @returns {integer} A random integer value.
-    '  */
-    public function GetInteger(seed = 100) as integer
-      return Rnd(seed)
-    end function
-
-    ' /**
-    '  * @memberof module:ItemGenerator
-    '  * @name GetFloat
-    '  * @function
-    '  * @instance
-    '  * @description Generates random float value.
-    '  * @returns {float} A random float value.
-    '  */
-    public function GetFloat() as float
-      return Rnd(0)
-    end function
-
-    ' /**
-    '  * @memberof module:ItemGenerator
-    '  * @name GetString
-    '  * @function
-    '  * @instance
-    '  * @description Generates random string with specified length.
-    '  * @param {Dynamic} seed - A string length
-    '  * @returns {string} A random string value or empty string if seed is 0.
-    '  */
-    public function GetString(seed as integer) as string
-
-      item = ""
-      if seed > 0
-        stringLength = Rnd(seed)
-
-        for i = 0 to stringLength
-          chType = Rnd(3)
-
-          if chType = 1 'Chr(48-57) - numbers
-            chNumber = 47 + Rnd(10)
-          else if chType = 2 'Chr(65-90) - Uppercase Letters
-            chNumber = 64 + Rnd(26)
-          else 'Chr(97-122) - Lowercase Letters
-            chNumber = 96 + Rnd(26)
-          end if
-
-          item = item + Chr(chNumber)
-        end for
-      end if
-
-      return item
-    end function
-
-  end class
-end namespace
\ No newline at end of file
diff --git a/src/Matchers.bs b/src/Matchers.bs
deleted file mode 100644
index e2c86ba4..00000000
--- a/src/Matchers.bs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace Rooibos.Matcher
-
-  function anyString(value)
-    return Rooibos.Common.isString(value)
-  end function
-
-  function anyBool(value)
-    return Rooibos.Common.isBoolean(value)
-  end function
-
-  function anyNumber(value)
-    return Rooibos.Common.isNumber(value)
-  end function
-
-  function anyAA(value)
-    return Rooibos.Common.isAssociativeArray(value)
-  end function
-
-  function anyArray(value)
-    return Rooibos.Common.isArray(value)
-  end function
-
-  function anyNode(value)
-    return Rooibos.Common.isSGNode(value)
-  end function
-
-
-end namespace
\ No newline at end of file
diff --git a/src/NodeMixin.bs b/src/NodeMixin.bs
deleted file mode 100644
index c7e20c9d..00000000
--- a/src/NodeMixin.bs
+++ /dev/null
@@ -1,41 +0,0 @@
-namespace Rooibos
-  ' /**
-  '  * @memberof module:TestRunner
-  '  * @name Rooibos_RunNodeTests
-  '  * @function
-  '  * @instance
-  '  * @description interface hook for exeucting tests on nodes. This method is for internal use only. Only the Rooibos framework should invoke this method
-  '  * @param {Dynamic} args - associated array, containing all the information required to execute the tests.
-  '  * @returns {Object} test stats object, for merging into main test stats
-  '  */
-  function RunNodeTests(args) as object
-    ? " RUNNING NODE TESTS"
-    totalStatObj = Rooibos.Stats.CreateTotalStatistic()
-
-    Rooibos.TestRunnerMixin.RunItGroups(args.metaTestSuite, totalStatObj, args.testUtilsDecoratorMethodName, args.config, args.runtimeConfig, m)
-    return totalStatObj
-  end function
-
-  ' /**
-  '  * @memberof module:TestRunner
-  '  * @name CreateTestNode
-  '  * @function
-  '  * @instance
-  '  * @description interface hook for correctly creating nodes that get tested. This ensures they are in the correct scope.
-  '  * This method must be defined in your tests scene xml.
-  '  * @param {String} nodeType - name of node to create. The framework will pass this in as required
-  '  * @returns {Object} the required node, or invalid if it could not be invoked.
-  '  */
-  function CreateTestNode(nodeType) as object
-    node = createObject("roSGNode", nodeType)
-
-    if (type(node) = "roSGNode" and node.subType() = nodeType)
-      m.top.AppendChild(node)
-      return node
-    else
-      ? " Error creating test node of type " ; nodeType
-      return invalid
-    end if
-  end function
-
-end namespace
\ No newline at end of file
diff --git a/src/RuntimeConfig.bs b/src/RuntimeConfig.bs
deleted file mode 100644
index 9cf1747e..00000000
--- a/src/RuntimeConfig.bs
+++ /dev/null
@@ -1,39 +0,0 @@
-namespace Rooibos
-  class UnitTestRuntimeConfig
-
-    public hasSoloSuites = false
-    public hasSoloGroups = false
-    public hasSoloTests = false
-
-    public function new()
-      m.suites = m.CreateSuites()
-    end function
-
-    public function createSuites()
-      'bs:disable-next-line
-      suites = RBSFM_getTestSuitesForProject()
-      includedSuites = []
-      for i = 0 to suites.count() - 1
-        suite = suites[i]
-        if (suite.valid)
-          if (suite.isSolo)
-            m.hasSoloSuites = true
-          end if
-          if (suite.hasSoloTests = true)
-            m.hasSoloTests = true
-          end if
-          if (suite.hasSoloGroups = true)
-            m.hasSoloGroups = true
-          end if
-          '          ? "valid - suite"
-          includedSuites.push(suite)
-        else
-          ? "ERROR! suite was not valid - ignoring"
-        end if
-
-      end for
-      return includedSuites
-    end function
-
-  end class
-end namespace
\ No newline at end of file
diff --git a/src/TestCase.bs b/src/TestCase.bs
deleted file mode 100644
index 95916e05..00000000
--- a/src/TestCase.bs
+++ /dev/null
@@ -1,38 +0,0 @@
-namespace Rooibos
-  class UnitTestCase
-
-    public isSolo
-    public func
-    public funcName
-    public isIgnored
-    public name
-    public lineNumber
-    public paramLineNumber
-    public assertIndex = 0
-    'Map with which the testsuite processor can take the index of a an assert line, and map it to the line Number
-    public assertLineNumberMap = {}
-    public getTestLineIndex = 0
-    public rawParams
-    public paramTestIndex
-    public isParamTest = false
-    public time = 0
-
-    public function new(name as string, func as dynamic, funcName as string, isSolo as boolean, isIgnored as boolean, lineNumber as integer, params = invalid, paramTestIndex = 0, paramLineNumber = 0)
-      m.isSolo = isSolo
-      m.func = func
-      m.funcName = funcName
-      m.isIgnored = isIgnored
-      m.name = name
-      m.lineNumber = lineNumber
-      m.paramLineNumber = paramLineNumber
-      m.rawParams = params
-      m.paramTestIndex = paramTestIndex
-
-      if (params <> invalid)
-        m.name = m.name + stri(m.paramTestIndex)
-      end if
-
-      return this
-    end function
-  end class
-end namespace
\ No newline at end of file
diff --git a/src/TestLogger.bs b/src/TestLogger.bs
deleted file mode 100644
index 447ebc5f..00000000
--- a/src/TestLogger.bs
+++ /dev/null
@@ -1,230 +0,0 @@
-namespace Rooibos
-  class Logger
-
-    public function new(config)
-      m.config = config
-
-      m.verbosityLevel = {
-        basic: 0
-        normal: 1
-        verbose: 2
-      }
-
-      m.verbosity = m.config.logLevel
-    end function
-
-    '----------------------------------------------------------------
-    ' Print statistic object with specified verbosity.
-    '
-    ' @param statObj (object) A statistic object to print.
-    '----------------------------------------------------------------
-    public sub printStatistic(statObj as object)
-      m.PrintStart()
-      previousfile = invalid
-
-      for each testSuite in statObj.Suites
-        if (not statObj.testRunHasFailures or ((not m.config.showOnlyFailures) or testSuite.fail > 0 or testSuite.crash > 0))
-          if (testSuite.metaTestSuite.filePath <> previousfile)
-            m.PrintMetaSuiteStart(testSuite.metaTestSuite)
-            previousfile = testSuite.metaTestSuite.filePath
-          end if
-          m.PrintSuiteStatistic(testSuite, statObj.testRunHasFailures)
-        end if
-      end for
-
-      ? ""
-      m.PrintEnd()
-      'bs:disable-next-line
-      ignoredInfo = RBSFM_getIgnoredTestInfo()
-      ? "Total  = "; Rooibos.Common.AsString(statObj.Total); " ; Passed  = "; statObj.Correct; " ; Failed   = "; statObj.Fail; " ; Ignored   = "; ignoredInfo.count
-      ? " Time spent: "; statObj.Time; "ms"
-      ? ""
-      ? ""
-      if (ignoredInfo.count > 0)
-        ? "IGNORED TESTS:"
-        for each ignoredItemName in ignoredInfo.items
-          print ignoredItemName
-        end for
-      end if
-
-      if (statObj.ignored > 0)
-        ? "IGNORED TESTS:"
-        for each ignoredItemName in statObj.IgnoredTestNames
-          print ignoredItemName
-        end for
-      end if
-
-      if (statObj.Total = statObj.Correct)
-        overrallResult = "Success"
-      else
-        overrallResult = "Fail"
-      end if
-      ? "RESULT: "; overrallResult
-
-    end sub
-
-    '----------------------------------------------------------------
-    ' Print test suite statistic.
-    '
-    ' @param statSuiteObj (object) A target test suite object to print.
-    '----------------------------------------------------------------
-    public sub printSuiteStatistic(statSuiteObj as object, hasFailures)
-      m.PrintSuiteStart(statSuiteObj.Name)
-
-      for each testCase in statSuiteObj.Tests
-        if (not hasFailures or ((not m.config.showOnlyFailures) or testCase.Result <> "Success"))
-          m.PrintTestStatistic(testCase)
-        end if
-      end for
-
-      ? " |"
-    end sub
-
-    public sub printTestStatistic(testCase as object)
-      metaTestCase = testCase.metaTestCase
-
-      if (LCase(testCase.Result) <> "success")
-        testChar = "-"
-        if metaTestCase.testResult.failedMockLineNumber > -1
-          lineNumber = metaTestCase.testResult.failedMockLineNumber
-        else
-          assertIndex = metaTestCase.testResult.failedAssertIndex
-          lineNumber = Rooibos.Common.getAssertLine(metaTestCase, assertIndex)
-        end if
-        if lineNumber <> invalid
-          locationLine = StrI(lineNumber).trim()
-        else
-          locationLine = StrI(metaTestCase.lineNumber).trim()
-        end if
-
-      else
-        testChar = "|"
-        locationLine = StrI(metaTestCase.lineNumber).trim()
-      end if
-      locationText = "pkg:/" + testCase.filePath.trim() + "(" + locationLine + ")"
-
-      if m.config.printTestTimes = true
-        timeText = " (" + stri(metaTestCase.time).trim() + "ms)"
-      else
-        timeText = ""
-      end if
-
-      insetText = ""
-      if (metaTestcase.isParamTest <> true)
-        messageLine = Rooibos.Common.fillText(" " + testChar + " |--" + metaTestCase.Name + " : ", ".", 80)
-        ? messageLine ; testCase.Result ; timeText
-      else if (metaTestcase.paramTestIndex = 0)
-        name = metaTestCase.Name
-        if (len(name) > 1 and right(name, 1) = "0")
-          name = left(name, len(name) - 1)
-        end if
-        ? " " + testChar + " |--" + name + " : "
-      end if
-
-      if (metaTestcase.isParamTest = true)
-        insetText = "  "
-
-        if type(metaTestCase.rawParams) = "roAssociativeArray"
-          rawParams = {}
-          for each key in metaTestCase.rawParams
-            if type(metaTestCase.rawParams[key]) <> "Function" and type(metaTestCase.rawParams[key]) <> "roFunction"
-              rawParams[key] = metaTestCase.rawParams[key]
-            end if
-          end for
-        else
-          rawParams = metaTestCase.rawParams
-        end if
-        messageLine = Rooibos.Common.fillText(" " + testChar + insetText + " |--" + formatJson(rawParams) + " : ", ".", 80)
-        ? messageLine ; testCase.Result ; timeText
-      end if
-
-      if LCase(testCase.Result) <> "success"
-        ? " | "; insettext ;"  |--Location: "; locationText
-        if (metaTestcase.isParamTest = true)
-          ? " | "; insettext ;"  |--Param Line: "; StrI(metaTestCase.paramlineNumber).trim()
-        end if
-        ? " | "; insettext ;"  |--Error Message: "; testCase.Error.Message
-      end if
-    end sub
-
-    '----------------------------------------------------------------
-    ' Print testting start message.
-    '----------------------------------------------------------------
-    public sub printStart()
-      ? ""
-      ? "[START TEST REPORT]"
-      ? ""
-    end sub
-
-    '----------------------------------------------------------------
-    ' Print testing end message.
-    '----------------------------------------------------------------
-    public sub printEnd()
-      ? ""
-      ? "[END TEST REPORT]"
-      ? ""
-    end sub
-
-    '----------------------------------------------------------------
-    ' Print test suite SetUp message.
-    '----------------------------------------------------------------
-    public sub printSuiteSetUp(sName as string)
-      if m.verbosity = m.verbosityLevel.verbose
-        ? "================================================================="
-        ? "===   SetUp "; sName; " suite."
-        ? "================================================================="
-      end if
-    end sub
-
-
-    '----------------------------------------------------------------
-    ' Print test suite start message.
-    '----------------------------------------------------------------
-
-    public sub printMetaSuiteStart(metaTestSuite)
-      ? metaTestSuite.name; " " ; "pkg:/" ; metaTestSuite.filePath + "(1)"
-    end sub
-
-    '----------------------------------------------------------------
-    ' Print '@It group start message.
-    '----------------------------------------------------------------
-    public sub printSuiteStart(sName as string)
-      '  ? "It "; sName
-      ? " |-" ; sName
-      '  ? ""
-    end sub
-
-    '----------------------------------------------------------------
-    ' Print test suite TearDown message.
-    '----------------------------------------------------------------
-    public sub printSuiteTearDown(sName as string)
-      if m.verbosity = m.verbosityLevel.verbose
-        ? "================================================================="
-        ? "===   TearDown "; sName; " suite."
-        ? "================================================================="
-      end if
-    end sub
-
-    '----------------------------------------------------------------
-    ' Print test setUp message.
-    '----------------------------------------------------------------
-    public sub printTestSetUp(tName as string)
-      if m.verbosity = m.verbosityLevel.verbose
-        ? "----------------------------------------------------------------"
-        ? "---   SetUp "; tName; " test."
-        ? "----------------------------------------------------------------"
-      end if
-    end sub
-
-    '----------------------------------------------------------------
-    ' Print test TearDown message.
-    '----------------------------------------------------------------
-    public sub printTestTearDown(tName as string)
-      if m.verbosity = m.verbosityLevel.verbose
-        ? "----------------------------------------------------------------"
-        ? "---   TearDown "; tName; " test."
-        ? "----------------------------------------------------------------"
-      end if
-    end sub
-  end class
-end namespace
diff --git a/src/UnitTestResult.bs b/src/UnitTestResult.bs
deleted file mode 100644
index a9d0b61d..00000000
--- a/src/UnitTestResult.bs
+++ /dev/null
@@ -1,54 +0,0 @@
-namespace Rooibos
-  class UnitTestResult
-
-    public messages = []
-    public isFail = false
-    public currentAssertIndex = 0
-    public failedAssertIndex = 0
-    public failedMockLineNumber = -1
-
-    public function reset() as void
-      m.isFail = false
-      m.failedMockLineNumber = -1
-      m.messages = []
-    end function
-
-    public function addResult(message as string) as string
-      if (message <> "")
-        m.messages.push(message)
-        if (not m.isFail)
-          m.failedAssertIndex = m.currentAssertIndex
-        end if
-        m.isFail = true
-      end if
-      m.currentAssertIndex++
-      return message
-    end function
-
-    public function addMockResult(lineNumber, message as string) as string
-      if (message <> "")
-        m.messages.push(message)
-        if (not m.isFail)
-          m.failedMockLineNumber = lineNumber
-        end if
-        m.isFail = true
-      end if
-      return message
-    end function
-
-    public function getResult() as string
-      if (m.isFail)
-        msg = m.messages.peek()
-
-        if (msg <> invalid)
-          return msg
-        else
-          return "unknown test failure"
-        end if
-      else
-        return ""
-      end if
-    end function
-
-  end class
-end namespace
\ No newline at end of file
diff --git a/src/manifest b/src/manifest
new file mode 100644
index 00000000..e69de29b
diff --git a/src/source/BaseTestSuite.bs b/src/source/BaseTestSuite.bs
new file mode 100644
index 00000000..c2e0990d
--- /dev/null
+++ b/src/source/BaseTestSuite.bs
@@ -0,0 +1,1926 @@
+' /**
+'  * @module TestSuite
+'  * @description All brs files that include `'@TestSuite` annotations automatically extend the TestSuite.
+'  * The base test suite contains all of the assertions, and utility methods required to writey our tests, as well as being responsible for tracking the state of the tests and groups.
+'  */
+class BaseTestSuite
+
+  public name = "BaseTestSuite"
+  public invalidValue = "#ROIBOS#INVALID_VALUE" ' special value used in mock arguments
+  public ignoreValue = "#ROIBOS#IGNORE_VALUE" ' special value used in mock arguments
+
+  'built in any matchers
+  public anyStringMatcher = { "matcher": Rooibos_Matcher_anyString }
+  public anyBoolMatcher = { "matcher": Rooibos_Matcher_anyBool }
+  public anyNumberMatcher = { "matcher": Rooibos_Matcher_anyNumber }
+  public anyAAMatcher = { "matcher": Rooibos_Matcher_anyAA }
+  public anyArrayMatcher = { "matcher": Rooibos_Matcher_anyArray }
+  public anyNodeMatcher = { "matcher": Rooibos_Matcher_anyNode }
+  public allowNonExistingMethodsOnMocks = true
+  public isAutoAssertingMocks = true
+
+  'Test Cases methods
+  public testCases = []
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name addTest
+  '  * @function
+  '  * @instance
+  '  * @description Add a test to a suite's test cases array. Used internally.
+  '  * @param {Dynamic} name - A test name.
+  '  * @param {Dynamic} func - A test function name.
+  '  */
+  public function addTest(name, func, funcName, setup = invalid, teardown = invalid)
+    m.testCases.Push(m.createTest(name, func, setup, teardown))
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name createTest
+  '  * @function
+  '  * @instance
+  '  * @description Create a test object. Used internally
+  '  * @param {Dynamic} name - A test name.
+  '  * @param {Dynamic} func - A test function name.
+  '  */
+  public function createTest(name, func, funcName, setup = invalid, teardown = invalid) as object
+
+    if (func = invalid)
+      ? " ASKED TO CREATE TEST WITH INVALID FUNCITON POINTER FOR FUNCTION " ; funcName
+    end if
+
+    return {
+      name: name
+      func: func
+      funcName: funcName
+      setUp: setup
+      tearDown: teardown
+    }
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name fail
+  '  * @function
+  '  * @instance
+  '  * @description Fail immediately, with the given message
+  '  * @param {Dynamic} [msg=""] - message to display in the test report
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function fail(msg = "Error") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    m.currentResult.addResult(msg)
+    return m.getLegacyCompatibleReturnValue(false)
+  end function
+
+  '*************************************************************
+  '** GetLegacyCompatibleReturnValue
+  '** will return the correct type of return value for a new-style/legacy test
+  '*************************************************************
+  public function getLegacyCompatibleReturnValue(value) as object
+    if (value = true)
+      if (m.isLegacy = true)
+        return ""
+      else
+        return true
+      end if
+    else
+      if (m.isLegacy = true)
+        return "ERROR"
+      else
+        return false
+      end if
+    end if
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertFalse
+  '  * @function
+  '  * @instance
+  '  * @description Fail the test if the expression is true.
+  '  * @param {Dynamic} expr - An expression to evaluate.
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  ' Default value: "Expression evaluates to true"'  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertFalse(expr, msg = "Expression evaluates to true") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if not Common.isBoolean(expr) or expr
+      return m.fail(msg)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertTrue
+  '  * @function
+  '  * @instance
+  '  * @description Fail the test unless the expression is true.
+  '  * @param {Dynamic} expr - An expression to evaluate.
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertTrue(expr, msg = "Expression evaluates to false")
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+
+    if not Common.isBoolean(expr) or not expr
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertEqual
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the two objects are unequal as determined by the '<>' operator.
+  '  * @param {Dynamic} first - first object to compare
+  '  * @param {Dynamic} second - second object to compare
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertEqual(first, second, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if not Common.eqValues(first, second)
+      if msg = ""
+        first_as_string = Common.asString(first)
+        second_as_string = Common.asString(second)
+        msg = first_as_string + " != " + second_as_string
+      end if
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertLike
+  '  * @function
+  '  * @instance
+  '  * @description does a fuzzy comparison
+  '  * @param {Dynamic} first - first object to compare
+  '  * @param {Dynamic} second - second object to compare
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertLike(first, second, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if first <> second
+      if msg = ""
+        first_as_string = Common.asString(first)
+        second_as_string = Common.asString(second)
+        msg = first_as_string + " != " + second_as_string
+      end if
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertNotEqual
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the two objects are equal as determined by the '=' operator.
+  '  * @param {Dynamic} first - first object to compare
+  '  * @param {Dynamic} second - second object to compare
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertNotEqual(first, second, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if Common.eqValues(first, second)
+      if msg = ""
+        first_as_string = Common.asString(first)
+        second_as_string = Common.asString(second)
+        msg = first_as_string + " == " + second_as_string
+      end if
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertInvalid
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the value is not invalid.
+  '  * @param {Dynamic} value - value to check - value to check for
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertInvalid(value, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if value <> invalid
+      if msg = ""
+        expr_as_string = Common.asString(value)
+        msg = expr_as_string + " <> Invalid"
+      end if
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertNotInvalid
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the value is invalid.
+  '  * @param {Dynamic} value - value to check - value to check for
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertNotInvalid(value, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if value = invalid
+      if msg = ""
+        expr_as_string = Common.asString(value)
+        msg = expr_as_string + " = Invalid"
+      end if
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertAAHasKey
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the array doesn't have the key.
+  '  * @param {Dynamic} array - target array
+  '  * @param {Dynamic} key - key name
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertAAHasKey(array, key, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if Common.isAssociativeArray(array)
+      if not array.DoesExist(key)
+        if msg = ""
+          msg = "Array doesn't have the '" + key + "' key."
+        end if
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      end if
+    else
+      msg = "Input value is not an Associative Array."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertAANotHasKey
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the array has the key.
+  '  * @param {Dynamic} array - target array
+  '  * @param {Dynamic} key - key name
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertAANotHasKey(array, key, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if Common.isAssociativeArray(array)
+      if array.DoesExist(key)
+        if msg = ""
+          msg = "Array has the '" + key + "' key."
+        end if
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      end if
+    else
+      msg = "Input value is not an Associative Array."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertAAHasKeys
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the array doesn't have the keys list.
+  '  * @param {Dynamic} array - A target associative array.
+  '  * @param {Dynamic} keys - Array of key names.
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertAAHasKeys(array, keys, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if Common.isAssociativeArray(array) and Common.isArray(keys)
+      for each key in keys
+        if not array.DoesExist(key)
+          if msg = ""
+            msg = "Array doesn't have the '" + key + "' key."
+          end if
+          m.currentResult.addResult(msg)
+          return m.getLegacyCompatibleReturnValue(false)
+        end if
+      end for
+    else
+      msg = "Input value is not an Associative Array."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertAANotHasKeys
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the array has the keys list.
+  '  * @param {Dynamic} array - A target associative array.
+  '  * @param {Dynamic} keys - Array of key names.
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertAANotHasKeys(array, keys, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if Common.isAssociativeArray(array) and Common.isArray(keys)
+      for each key in keys
+        if array.DoesExist(key)
+          if msg = ""
+            msg = "Array has the '" + key + "' key."
+          end if
+          m.currentResult.addResult(msg)
+          return m.getLegacyCompatibleReturnValue(false)
+        end if
+      end for
+    else
+      msg = "Input value is not an Associative Array."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertArrayContains
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the array doesn't have the item.
+  '  * @param {Dynamic} array - target array
+  '  * @param {Dynamic} value - value to check - value to check for
+  '  * @param {Dynamic} key - key name in associative array
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertArrayContains(array, value, key = invalid, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if Common.isAssociativeArray(array) or Common.isArray(array)
+      if not Common.arrayContains(array, value, key)
+        msg = "Array doesn't have the '" + Common.asString(value) + "' value."
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      end if
+    else
+      msg = "Input value is not an Array."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertArrayContainsAAs
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the array does not contain all of the aa's in the values array.
+  '  * @param {Dynamic} array - target array
+  '  * @param {Dynamic} values - array of aas to look for in target array
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertArrayContainsAAs(array, values, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+
+    if not Common.isArray(values)
+      msg = "values to search for are not an Array."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+
+    if Common.isArray(array)
+      for each value in values
+        isMatched = false
+        if not Common.isAssociativeArray(value)
+          msg = "Value to search for was not associativeArray " + Common.asString(value)
+          m.currentResult.addResult(msg)
+          return m.getLegacyCompatibleReturnValue(false)
+        end if
+        for each item in array
+          if (Common.IsAssociativeArray(item))
+            isValueMatched = true
+            for each key in value
+              fieldValue = value[key]
+              itemValue = item[key]
+              if (not Common.eqValues(fieldValue, itemValue))
+                isValueMatched = false
+                exit for
+              end if
+            end for
+            if (isValueMatched)
+              isMatched = true
+              exit for
+            end if
+          end if
+        end for ' items in array
+
+        if not isMatched
+          msg = "array missing value: " + Common.asString(value)
+          m.currentResult.addResult(msg)
+          return m.getLegacyCompatibleReturnValue(false)
+        end if
+
+      end for 'values to match
+    else
+      msg = "Input value is not an Array."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertArrayNotContains
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the array has the item.
+  '  * @param {Dynamic} array - target array
+  '  * @param {Dynamic} array - target array
+  '  * @param {Dynamic} value - value to check - Value to check for
+  '  * @param {Dynamic} key - A key name for associative array.
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertArrayNotContains(array, value, key = invalid, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if Common.isAssociativeArray(array) or Common.isArray(array)
+      if Common.arrayContains(array, value, key)
+        msg = "Array has the '" + Common.asString(value) + "' value."
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      end if
+    else
+      msg = "Input value is not an Array."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertArrayContainsSubset
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the array doesn't have the item subset.
+  '  * @param {Dynamic} array - target array
+  '  * @param {Dynamic} subset - items to check presnece of
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertArrayContainsSubset(array, subset, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if (Common.isAssociativeArray(array) and Common.isAssociativeArray(subset)) or (Common.isArray(array) and Common.isArray(subset))
+      isAA = Common.isAssociativeArray(subset)
+      for each item in subset
+        key = invalid
+        value = item
+        if isAA
+          key = item
+          value = subset[key]
+        end if
+        if not Common.arrayContains(array, value, key)
+          msg = "Array doesn't have the '" + Common.asString(value) + "' value."
+          m.currentResult.addResult(msg)
+          return m.getLegacyCompatibleReturnValue(false)
+        end if
+      end for
+    else
+      msg = "Input value is not an Array."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertArrayNotContainsSubset
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the array have the item from subset.
+  '  * @param {Dynamic} array - target array
+  '  * @param {Dynamic} subset - items to check presnece of
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertArrayNotContainsSubset(array, subset, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if (Common.isAssociativeArray(array) and Common.isAssociativeArray(subset)) or (Common.isArray(array) and Common.isArray(subset))
+      isAA = Common.isAssociativeArray(subset)
+      for each item in subset
+        key = invalid
+        value = item
+        if isAA
+          key = item
+          value = item[key]
+        end if
+        if Common.arrayContains(array, value, key)
+          msg = "Array has the '" + Common.asString(value) + "' value."
+          m.currentResult.addResult(msg)
+          return m.getLegacyCompatibleReturnValue(false)
+        end if
+      end for
+    else
+      msg = "Input value is not an Array."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertArrayCount
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the array items count <> expected count
+  '  * @param {Dynamic} array - target array
+  '  * @param {Dynamic} count - An expected array items count
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertArrayCount(array, count, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if Common.isAssociativeArray(array) or Common.isArray(array)
+      if array.Count() <> count
+        msg = "Array items count " + Common.asString(array.Count()) + " <> " + Common.asString(count) + "."
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      end if
+    else
+      msg = "Input value is not an Array."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertArrayNotCount
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the array items count = expected count.
+  '  * @param {Dynamic} array - target array
+  '  * @param {Dynamic} count - An expected array items count.
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertArrayNotCount(array, count, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if Common.isAssociativeArray(array) or Common.isArray(array)
+      if array.Count() = count
+        msg = "Array items count = " + Common.asString(count) + "."
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      end if
+    else
+      msg = "Input value is not an Array."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertEmpty
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the item is not empty array or string.
+  '  * @param {Dynamic} item - item to check
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertEmpty(item, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if Common.isAssociativeArray(item) or Common.isArray(item)
+      if item.count() > 0
+        msg = "Array is not empty."
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      end if
+    else if (Common.isString(item))
+      if (Common.asString(item) <> "")
+        msg = "Input value is not empty."
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      end if
+    else
+      msg = "AssertEmpty: Input value was not an array or a string"
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertNotEmpty
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the item is empty array or string.
+  '  * @param {Dynamic} item - item to check
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertNotEmpty(item, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if Common.isAssociativeArray(item) or Common.isArray(item)
+      if item.count() = 0
+        msg = "Array is empty."
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      end if
+    else if Common.isString(item)
+      if (item = "")
+        msg = "Input value is empty."
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      end if
+    else
+      msg = "Input value is not a string or array."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertArrayContainsOnlyValuesOfType
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the array doesn't contains items of specific type only.
+  '  * @param {Dynamic} array - target array
+  '  * @param {Dynamic} typeStr - type name - must be String, Array, Boolean, or AssociativeArray
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertArrayContainsOnlyValuesOfType(array, typeStr, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if typeStr <> "String" and typeStr <> "Integer" and typeStr <> "Boolean" and typeStr <> "Array" and typeStr <> "AssociativeArray"
+      msg = "Type must be Boolean, String, Array, Integer, or AssociativeArray"
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+
+    if Common.isAssociativeArray(array) or Common.isArray(array)
+      methodName = "Rooibos_Common_Is" + typeStr
+      typeCheckFunction = m.getIsTypeFunction(methodName)
+      if (typeCheckFunction <> invalid)
+        for each item in array
+          if not typeCheckFunction(item)
+            msg = Common.asString(item) + "is not a '" + typeStr + "' type."
+            m.currentResult.addResult(msg)
+            return m.getLegacyCompatibleReturnValue(false)
+          end if
+        end for
+      else
+        msg = "could not find comparator for type '" + typeStr + "' type."
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      end if
+    else
+      msg = "Input value is not an Array."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  public function getIsTypeFunction(name)
+    if name = "Rooibos_Common_IsFunction"
+      return Common.isFunction
+    else if name = "Rooibos_Common_IsXmlElement"
+      return Common.isXmlElement
+    else if name = "Rooibos_Common_IsInteger"
+      return Common.isInteger
+    else if name = "Rooibos_Common_IsBoolean"
+      return Common.isBoolean
+    else if name = "Rooibos_Common_IsFloat"
+      return Common.isFloat
+    else if name = "Rooibos_Common_IsDouble"
+      return Common.isDouble
+    else if name = "Rooibos_Common_IsLongInteger"
+      return Common.isLongInteger
+    else if name = "Rooibos_Common_IsNumber"
+      return Common.isNumber
+    else if name = "Rooibos_Common_IsList"
+      return Common.isList
+    else if name = "Rooibos_Common_IsArray"
+      return Common.isArray
+    else if name = "Rooibos_Common_IsAssociativeArray"
+      return Common.isAssociativeArray
+    else if name = "Rooibos_Common_IsSGNode"
+      return Common.isSGNode
+    else if name = "Rooibos_Common_IsString"
+      return Common.isString
+    else if name = "Rooibos_Common_IsDateTime"
+      return Common.isDateTime
+    else if name = "Rooibos_Common_IsUndefined"
+      return Common.isUndefined
+    else
+      return invalid
+    end if
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertType
+  '  * @function
+  '  * @instance
+  '  * @description Asserts that the value is a node of designated type
+  '  * @param {Dynamic} value - value to check - target node
+  '  * @param {Dynamic} typeStr - type name
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertType(value, typeStr, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if type(value) <> typeStr
+      if msg = ""
+        expr_as_string = Common.asString(value)
+        msg = expr_as_string + " was not expected type " + typeStr
+      end if
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertSubType
+  '  * @function
+  '  * @instance
+  '  * @description Asserts that the value is a node of designated subtype
+  '  * @param {Dynamic} value - value to check - target node
+  '  * @param {Dynamic} typeStr - type name
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertSubType(value, typeStr, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if type(value) <> "roSGNode"
+      if msg = ""
+        expr_as_string = Common.asString(value)
+        msg = expr_as_string + " was not a node, so could not match subtype " + typeStr
+      end if
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    else if (value.subType() <> typeStr)
+      if msg = ""
+        expr_as_string = Common.asString(value)
+        msg = expr_as_string + "( type : " + value.subType() + ") was not of subType " + typeStr
+      end if
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '++ NEW NODE ASSERTS
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertNodeCount
+  '  * @function
+  '  * @instance
+  '  * @description Asserts that the node contains the desginated number of children
+  '  * @param {Dynamic} node - target node
+  '  * @param {Dynamic} count - expected number of child items
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert w, false otherwise
+  '  */
+  public function assertNodeCount(node, count, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if type(node) = "roSGNode"
+      if node.getChildCount() <> count
+        msg = "node items count <> " + Common.asString(count) + ". Received " + Common.asString(node.getChildCount())
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      end if
+    else
+      msg = "Input value is not an node."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertNodeNotCount
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the node items count = expected count.
+  '  * @param {Dynamic} node - A target node
+  '  * @param {Dynamic} count - Expected item count
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertNodeNotCount(node, count, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if type(node) = "roSGNode"
+      if node.getChildCount() = count
+        msg = "node items count = " + Common.asString(count) + "."
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      end if
+    else
+      msg = "Input value is not an node."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertNodeEmpty
+  '  * @function
+  '  * @instance
+  '  * @description Asserts the node has no children
+  '  * @param {Dynamic} node - a node to check
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertNodeEmpty(node, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if type(node) = "roSGNode"
+      if node.getChildCount() > 0
+        msg = "node is not empty."
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      end if
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertNodeNotEmpty
+  '  * @function
+  '  * @instance
+  '  * @description Asserts the node has children
+  '  * @param {Dynamic} node - a node to check
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertNodeNotEmpty(node, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if type(node) = "roSGNode"
+      if node.Count() = 0
+        msg = "Array is empty."
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      end if
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertNodeContains
+  '  * @function
+  '  * @instance
+  '  * @description Asserts the node contains the child _value_
+  '  * @param {Dynamic} node - a node to check
+  '  * @param {Dynamic} value - value to check - value to look for
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertNodeContains(node, value, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if type(node) = "roSGNode"
+      if not Common.nodeContains(node, value)
+        msg = "Node doesn't have the '" + Common.asString(value) + "' value."
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      end if
+    else
+      msg = "Input value is not an Node."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertNodeContainsOnly
+  '  * @function
+  '  * @instance
+  '  * @description Asserts the node contains only the child _value_
+  '  * @param {Dynamic} node - a node to check
+  '  * @param {Dynamic} value - value to check - value to look for
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertNodeContainsOnly(node, value, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if type(node) = "roSGNode"
+      if not Common.nodeContains(node, value)
+        msg = "Node doesn't have the '" + Common.asString(value) + "' value."
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      else if node.getChildCount() <> 1
+        msg = "Node Contains speicified value; but other values as well"
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      end if
+    else
+      msg = "Input value is not an Node."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertNodeNotContains
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the node h item.
+  '  * @param {Dynamic} node - A target node
+  '  * @param {Dynamic} value - value to check - a node child
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertNodeNotContains(node, value, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if type(node) = "roSGNode"
+      if Common.nodeContains(node, value)
+        msg = "Node has the '" + Common.asString(value) + "' value."
+        m.currentResult.addResult(msg)
+        return m.getLegacyCompatibleReturnValue(false)
+      end if
+    else
+      msg = "Input value is not an Node."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertNodeContainsFields
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the node doesn't have the item subset.
+  '  * @param {Dynamic} node - A target node
+  '  * @param {Dynamic} subset - items to check
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertNodeContainsFields(node, subset, ignoredFields = invalid, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if (type(node) = "roSGNode" and Common.isAssociativeArray(subset)) or (type(node) = "roSGNode" and Common.isArray(subset))
+      isAA = Common.isAssociativeArray(subset)
+      isIgnoredFields = Common.isArray(ignoredFields)
+      for each key in subset
+        if (key <> "")
+          if (not isIgnoredFields or not Common.arrayContains(ignoredFields, key))
+            subsetValue = subset[key]
+            nodeValue = node[key]
+            if not Common.eqValues(nodeValue, subsetValue)
+              msg = key + ": Expected '" + Common.asString(subsetValue) + "', got '" + Common.asString(nodeValue) + "'"
+              m.currentResult.addResult(msg)
+              return m.getLegacyCompatibleReturnValue(false)
+            end if
+          end if
+        else
+          ? "Found empty key!"
+        end if
+      end for
+    else
+      msg = "Input value is not an Node."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertNodeNotContainsFields
+  '  * @function
+  '  * @instance
+  '  * @description Fail if the node have the item from subset.
+  '  * @param {Dynamic} node - A target node
+  '  * @param {Dynamic} subset - the items to check for
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert w, false otherwise
+  ' */
+  public function assertNodeNotContainsFields(node, subset, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if (type(node) = "roSGNode" and Common.isAssociativeArray(subset)) or (type(node) = "roSGNode" and Common.isArray(subset))
+      isAA = Common.isAssociativeArray(subset)
+      for each item in subset
+        key = invalid
+        value = item
+        if isAA
+          key = item
+          value = item[key]
+        end if
+        if Common.nodeContains(node, value)
+          msg = "Node has the '" + Common.asString(value) + "' value."
+          m.currentResult.addResult(msg)
+          return m.getLegacyCompatibleReturnValue(false)
+        end if
+      end for
+    else
+      msg = "Input value is not an Node."
+      m.currentResult.addResult(msg)
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '++ END NODE ASSERTS
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertAAContainsSubset
+  '  * @function
+  '  * @instance
+  '  * @description Asserts the associative array contains the fields contained in subset; while ignoring the fields in the ignoredFields array
+  '  * @param {Dynamic} array - associative array  to check
+  '  * @param {Dynamic} subset - associative array of values to check for
+  '  * @param {Dynamic} ignoredFields - array of fieldnames to ignore while comparing
+  '  * @param {Dynamic} [msg=""] - alternate error message
+  '  * @returns {boolean} - true if the assert was satisfied, false otherwise
+  '  */
+  public function assertAAContainsSubset(array, subset, ignoredFields = invalid, msg = "") as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if (Common.isAssociativeArray(array) and Common.isAssociativeArray(subset))
+      isAA = Common.isAssociativeArray(subset)
+      isIgnoredFields = Common.isArray(ignoredFields)
+      for each key in subset
+        if (key <> "")
+          if (not isIgnoredFields or not Common.arrayContains(ignoredFields, key))
+            subsetValue = subset[key]
+            arrayValue = array[key]
+            if not Common.eqValues(arrayValue, subsetValue)
+              msg = key + ": Expected '" + Common.asString(subsetValue) + "', got '" + Common.asString(arrayValue) + "'"
+              m.currentResult.addResult(msg)
+              return m.getLegacyCompatibleReturnValue(false)
+            end if
+          end if
+        else
+          ? "Found empty key!"
+        end if
+      end for
+    else
+      msg = "Input values are not an Associative Array."
+
+      return m.getLegacyCompatibleReturnValue(false)
+    end if
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '++ Stubbing helpers
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name stub
+  '  * @function
+  '  * @instance
+  '  * @description Creates a stub to replace a real method with
+  '  * @param {Dynamic} target - object on which the method to be stubbed is found
+  '  * @param {Dynamic} methodName - name of method to stub
+  '  * @param {Dynamic} [returnValue=invalid] - value that the stub method will return when invoked
+  '  * @param {boolean} [allowNonExistingMethods=false] - if true, then rooibos will only warn if the method did not exist prior to faking
+  '  * @returns {Object} - stub that was wired into the real method
+  '  */
+  public function stub(target, methodName, returnValue = invalid, allowNonExistingMethods = false) as object
+    if (type(target) <> "roAssociativeArray")
+      m.fail("could not create Stub provided target was null")
+      return {}
+    end if
+
+    if (m.stubs = invalid)
+      m.__stubId = -1
+      m.stubs = {}
+    end if
+    m.__stubId++
+
+    if (m.__stubId > 5)
+      ? "ERROR ONLY 6 STUBS PER TEST ARE SUPPORTED!!"
+      return invalid
+    end if
+
+    id = stri(m.__stubId).trim()
+
+    fake = m.createFake(id, target, methodName, 1, invalid, returnValue)
+    m.stubs[id] = fake
+    allowNonExisting = m.allowNonExistingMethodsOnMocks = true or allowNonExistingMethods
+    isMethodPresent = type(target[methodName]) = "Function" or type(target[methodName]) = "roFunction"
+    if (isMethodPresent or allowNonExisting)
+      target[methodName] = m["StubCallback" + id]
+      target.__stubs = m.stubs
+
+      if (not isMethodPresent)
+        ? "WARNING - stubbing call " ; methodName; " which did not exist on target object"
+      end if
+    else
+      ? "ERROR - could not create Stub : method not found  "; target ; "." ; methodName
+    end if
+
+    return fake
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name expectOnce
+  '  * @function
+  '  * @instance
+  '  * @description Creates a stub to replace a real method with, which the framework will track. If it was invoked the wrong number of times, or with wrong arguments, it will result in test failure
+  '  * @param {Dynamic} target - object on which the method to be stubbed is found
+  '  * @param {Dynamic} methodName - name of method to stub
+  '  * @param {Dynamic} [expectedArgs=invalid] - array containing the arguments we expect the method to be invoked with
+  '  * @param {Dynamic} [returnValue=invalid] - value that the stub method will return when invoked
+  '  * @param {boolean} [allowNonExistingMethods=false] - if true, then rooibos will only warn if the method did not exist prior to faking
+  '  * @returns {Object} - mock that was wired into the real method
+  '  */
+  public function expectOnce(target, methodName, expectedArgs = invalid, returnValue = invalid, allowNonExistingMethods = false) as object
+    return m.mock(target, methodName, 1, expectedArgs, returnValue, allowNonExistingMethods)
+  end function
+
+  public function expectOnceWLN(lineNumber, target, methodName, expectedArgs = invalid, returnValue = invalid, allowNonExistingMethods = false) as object
+    return m.mock(target, methodName, 1, expectedArgs, returnValue, allowNonExistingMethods, lineNumber)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name expectOnceOrNone
+  '  * @function
+  '  * @instance
+  '  * @description Toggles between expectOnce and expectNone, to allow for easy paremeterized expect behaviour
+  '  * @param {Dynamic} target - object on which the method to be stubbed is found
+  '  * @param {Dynamic} methodName - name of method to stub
+  '  * @param {Dynamic} isExpected - if true, then this is the same as expectOnce, if false, then this is the same as expectNone
+  '  * @param {Dynamic} [expectedArgs=invalid] - array containing the arguments we expect the method to be invoked with
+  '  * @param {Dynamic} [returnValue=invalid] - value that the stub method will return when invoked
+  '  * @param {boolean} [allowNonExistingMethods=false] - if true, then rooibos will only warn if the method did not exist prior to faking
+  '  * @returns {Object} - mock that was wired into the real method
+  '  */
+  public function expectOnceOrNone(target, methodName, isExpected, expectedArgs = invalid, returnValue = invalid, allowNonExistingMethods = false) as object
+    if isExpected
+      return m.expectOnce(target, methodName, expectedArgs, returnValue, allowNonExistingMethods)
+    else
+      return m.expectNone(target, methodName, allowNonExistingMethods)
+    end if
+  end function
+
+  public function expectOnceOrNoneWLN(lineNumber, target, methodName, isExpected, expectedArgs = invalid, returnValue = invalid, allowNonExistingMethods = false) as object
+    if isExpected
+      return m.expectOnceWLN(lineNumber, target, methodName, expectedArgs, returnValue, allowNonExistingMethods)
+    else
+      return m.expectNoneWLN(lineNumber, target, methodName, allowNonExistingMethods)
+    end if
+  end function
+
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name expectNone
+  '  * @function
+  '  * @instance
+  '  * @description Creates a stub to replace a real method with, which the framework will track. If it was invoked, it will result in test failure
+  '  * @param {Dynamic} target - object on which the method to be stubbed is found
+  '  * @param {Dynamic} methodName - name of method to stub
+  '  * @param {boolean} [allowNonExistingMethods=false] - if true, then rooibos will only warn if the method did not exist prior to faking
+  '  * @returns {Object} - mock that was wired into the real method
+  '  */
+  public function expectNone(target, methodName, allowNonExistingMethods = false) as object
+    return m.mock(target, methodName, 0, invalid, invalid, allowNonExistingMethods)
+  end function
+
+  public function expectNoneWLN(lineNumber, target, methodName, allowNonExistingMethods = false) as object
+    return m.mock(target, methodName, 0, invalid, invalid, allowNonExistingMethods, lineNumber)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name expect
+  '  * @function
+  '  * @instance
+  '  * @description Creates a stub to replace a real method with, which the framework will track. If it was invoked the wrong number of times, or with wrong arguments, it will result in test failure
+  '  * @param {Dynamic} target - object on which the method to be stubbed is found
+  '  * @param {Dynamic} methodName - name of method to stub
+  '  * @param {Dynamic} [expectedInvocations=1] - number of invocations we expect
+  '  * @param {Dynamic} [expectedArgs=invalid] - array containing the arguments we expect the method to be invoked with
+  '  * @param {Dynamic} [returnValue=invalid] - value that the stub method will return when invoked
+  '  * @param {boolean} [allowNonExistingMethods=false] - if true, then rooibos will only warn if the method did not exist prior to faking
+  '  * @returns {Object} - mock that was wired into the real method
+  '  */
+  public function expect(target, methodName, expectedInvocations = 1, expectedArgs = invalid, returnValue = invalid, allowNonExistingMethods = false) as object
+    return m.mock(target, methodName, expectedInvocations, expectedArgs, returnValue, allowNonExistingMethods)
+  end function
+
+  public function expectWLN(lineNumber, target, methodName, expectedInvocations = 1, expectedArgs = invalid, returnValue = invalid, allowNonExistingMethods = false) as object
+    return m.mock(target, methodName, expectedInvocations, expectedArgs, returnValue, allowNonExistingMethods, lineNumber)
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name mock
+  '  * @function
+  '  * @instance
+  '  * @description Creates a stub to replace a real method with, which the framework will track. If it was invoked the wrong number of times, or with wrong arguments, it will result in test failure
+  '  * @param {Dynamic} target - object on which the method to be stubbed is found
+  '  * @param {Dynamic} methodName - name of method to stub
+  '  * @param {Dynamic} expectedInvocations - number of invocations we expect
+  '  * @param {Dynamic} [expectedArgs=invalid] - array containing the arguments we expect the method to be invoked with
+  '  * @param {Dynamic} [returnValue=invalid] - value that the stub method will return when invoked
+  '  * @param {boolean} [allowNonExistingMethods=false] - if true, then rooibos will only warn if the method did not exist prior to faking
+  '  * @returns {Object} - mock that was wired into the real method
+  '  */
+  public function mock(target, methodName, expectedInvocations = 1, expectedArgs = invalid, returnValue = invalid, allowNonExistingMethods = false, lineNumber = -1) as object
+    'check params
+    if not Common.isAssociativeArray(target)
+      methodName = ""
+      m.mockFail(lineNumber, "", "mock args: target was not an AA")
+    else if not Common.isString(methodName)
+      methodName = ""
+      m.mockFail(lineNumber, "", "mock args: methodName was not a string")
+    else if not Common.isNumber(expectedInvocations)
+      m.mockFail(lineNumber, methodName, "mock args: expectedInvocations was not an int")
+    else if not Common.isArray(expectedArgs) and Common.isValid(expectedArgs)
+      m.mockFail(lineNumber, methodName, "mock args: expectedArgs was not invalid or an array of args")
+    else if Common.isUndefined(expectedArgs)
+      m.mockFail(lineNumber, methodName, "mock args: expectedArgs undefined")
+    else if Common.isUndefined(returnValue)
+      m.mockFail(lineNumber, methodName, "mock args: returnValue undefined")
+    end if
+
+    if m.currentResult.isFail
+      ? "ERROR! Cannot create MOCK. method " ; methodName ;" " str(lineNumber) ; " "; m.currentResult.messages.peek()
+      return {}
+    end if
+
+    if (m.mocks = invalid)
+      m.__mockId = -1
+      m.__mockTargetId = -1
+      m.mocks = {}
+    end if
+
+    fake = invalid
+    if not target.doesExist("__rooibosTargetId")
+      m.__mockTargetId++
+      target["__rooibosTargetId"] = m.__mockTargetId
+    end if
+    'ascertain if mock already exists
+    for i = 0 to m.__mockId
+      id = stri(i).trim()
+      mock = m.mocks[id]
+      if mock <> invalid and mock.methodName = methodName and mock.target.__rooibosTargetId = target.__rooibosTargetId
+        fake = mock
+        fake.lineNumbers.push(lineNumber)
+        exit for
+      end if
+    end for
+    if fake = invalid
+      m.__mockId++
+      id = stri(m.__mockId).trim()
+      if (m.__mockId > 25)
+        ? "ERROR ONLY 25 MOCKS PER TEST ARE SUPPORTED!! you're on # " ; m.__mockId
+        ? " Method was " ; methodName
+        return invalid
+      end if
+
+      fake = m.createFake(id, target, methodName, expectedInvocations, expectedArgs, returnValue, lineNumber)
+      m.mocks[id] = fake 'this will bind it to m
+      allowNonExisting = m.allowNonExistingMethodsOnMocks = true or allowNonExistingMethods
+      isMethodPresent = type(target[methodName]) = "Function" or type(target[methodName]) = "roFunction"
+      if (isMethodPresent or allowNonExisting)
+        target[methodName] = m["MockCallback" + id]
+        target.__mocks = m.mocks
+
+        if (not isMethodPresent)
+          ? "WARNING - mocking call " ; methodName; " which did not exist on target object"
+        end if
+      else
+        ? "ERROR - could not create Mock : method not found  "; target ; "." ; methodName
+      end if
+    else
+      m.combineFakes(fake, m.createFake(id, target, methodName, expectedInvocations, expectedArgs, returnValue, lineNumber))
+    end if
+    return fake
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name createFake
+  '  * @function
+  '  * @instance
+  '  * @description Creates a stub to replace a real method with. This is used internally.
+  '  * @param {Dynamic} target - object on which the method to be stubbed is found
+  '  * @param {Dynamic} methodName - name of method to stub
+  '  * @param {Dynamic} [expectedInvocations=1] - number of invocations we expect
+  '  * @param {Dynamic} [expectedArgs=invalid] - array containing the arguments we expect the method to be invoked with
+  '  * @param {Dynamic} [returnValue=invalid] - value that the stub method will return when invoked
+  '  * @returns {Object} - stub that was wired into the real method
+  '  */
+  public function createFake(id, target, methodName, expectedInvocations = 1, expectedArgs = invalid, returnValue = invalid, lineNumber = -1) as object
+    expectedArgsValues = []
+    hasArgs = Common.isArray(expectedArgs)
+    if (hasArgs)
+      defaultValue = m.invalidValue
+    else
+      defaultValue = m.ignoreValue
+      expectedArgs = []
+    end if
+    lineNumbers = [lineNumber]
+
+    for i = 0 to 9
+      if (hasArgs and expectedArgs.count() > i)
+        'guard against bad values 
+        value = expectedArgs[i]
+        if not Common.isUndefined(value)
+          if Common.isAssociativeArray(value) and Common.isValid(value.matcher)
+            if not Common.isFunction(value.matcher)
+              ? "[ERROR] you have specified a matching function; but it is not in scope!"
+              expectedArgsValues.push("#ERR-OUT_OF_SCOPE_MATCHER!")
+            else
+              expectedArgsValues.push(expectedArgs[i])
+            end if
+          else
+            expectedArgsValues.push(expectedArgs[i])
+          end if
+        else
+          expectedArgsValues.push("#ERR-UNDEFINED!")
+        end if
+      else
+        expectedArgsValues.push(defaultValue)
+      end if
+    end for
+    fake = {
+      id: id,
+      target: target,
+      methodName: methodName,
+      returnValue: returnValue,
+      lineNumbers: lineNumbers,
+      isCalled: false,
+      invocations: 0,
+      invokedArgs: [invalid, invalid, invalid, invalid, invalid, invalid, invalid, invalid, invalid],
+      expectedArgs: expectedArgsValues,
+      expectedInvocations: expectedInvocations,
+      callback: function(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+        ' ? "FAKE CALLBACK CALLED FOR " ; m.methodName
+        if (m.allInvokedArgs = invalid)
+          m.allInvokedArgs = []
+        end if
+        m.invokedArgs = [arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9]
+        m.allInvokedArgs.push ([arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9])
+        m.isCalled = true
+        m.invocations++
+
+        if (type(m.returnValue) = "roAssociativeArray" and m.returnValue.doesExist("multiResult"))
+          returnValues = m.returnValue["multiResult"]
+          returnIndex = m.invocations - 1
+
+          if (type(returnValues) = "roArray" and returnValues.count() > 0)
+
+            if returnValues.count() <= m.invocations
+              returnIndex = returnValues.count() - 1
+              print "Multi return values all used up - repeating last value"
+            end if
+            return returnValues[returnIndex]
+          else
+            ? "Multi return value was specified; but no array of results were found"
+            return invalid
+          end if
+        else
+          return m.returnValue
+        end if
+      end function
+    }
+    return fake
+  end function
+
+  public function combineFakes(fake, otherFake)
+    'add on the expected invoked args
+    if type(fake.expectedArgs) <> "roAssociativeArray" or not fake.expectedArgs.doesExist("multiInvoke")
+      currentExpectedArgsArgs = fake.expectedArgs
+      fake.expectedArgs = {
+        "multiInvoke": [currentExpectedArgsArgs]
+      }
+    end if
+    fake.expectedArgs.multiInvoke.push(otherFake.expectedArgs)
+
+    'add on the expected return values
+    if type(fake.returnValue) <> "roAssociativeArray" or not fake.returnValue.doesExist("multiResult")
+      currentReturnValue = fake.returnValue
+      fake.returnValue = {
+        "multiResult": [currentReturnValue]
+      }
+    end if
+    fake.returnValue.multiResult.push(otherFake.returnValue)
+    fake.lineNumbers.push(lineNumber)
+    fake.expectedInvocations++
+  end function
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name assertMocks
+  '  * @function
+  '  * @instance
+  '  * @description Will check all mocks that have been created to ensure they were invoked the expected amount of times, with the expected args.
+  '  */
+  public function assertMocks() as void
+    if (m.__mockId = invalid or not Common.isAssociativeArray(m.mocks))
+      return
+    end if
+
+    lastId = int(m.__mockId)
+    for each id in m.mocks
+      mock = m.mocks[id]
+      methodName = mock.methodName
+      if (mock.expectedInvocations <> mock.invocations)
+        m.mockFail(mock.lineNumbers[0], methodName, "Wrong number of calls. (" + stri(mock.invocations).trim() + " / " + stri(mock.expectedInvocations).trim() + ")")
+        m.cleanMocks()
+        return
+      else if mock.expectedInvocations > 0 and (Common.isArray(mock.expectedArgs) or (type(mock.expectedArgs) = "roAssociativeArray" and Common.isArray(mock.expectedArgs.multiInvoke)))
+        isMultiArgsSupported = type(mock.expectedArgs) = "roAssociativeArray" and Common.isArray(mock.expectedArgs.multiInvoke)
+
+        for invocationIndex = 0 to mock.invocations - 1
+          invokedArgs = mock.allInvokedArgs[invocationIndex]
+          if isMultiArgsSupported
+            expectedArgs = mock.expectedArgs.multiInvoke[invocationIndex]
+          else
+            expectedArgs = mock.expectedArgs
+          end if
+          for i = 0 to expectedArgs.count() - 1
+            value = invokedArgs[i]
+            expected = expectedArgs[i]
+            didNotExpectArg = Common.isString(expected) and expected = m.invalidValue
+            if (didNotExpectArg)
+              expected = invalid
+            end if
+
+            isUsingMatcher = Common.isAssociativeArray(expected) and Common.isFunction(expected.matcher)
+
+            if isUsingMatcher
+              if not expected.matcher(value)
+                m.mockFail(mock.lineNumbers[invocationIndex], methodName, "on Invocation #" + stri(invocationIndex).trim() + ", expected arg #" + stri(i).trim() + "  to match matching function '" + Common.asString(expected.matcher) + "' got '" + Common.asString(value) + "')")
+                m.cleanMocks()
+              end if
+            else
+              if (not (Common.isString(expected) and expected = m.ignoreValue) and not Common.eqValues(value, expected))
+                if (expected = invalid)
+                  expected = "[INVALID]"
+                end if
+
+                m.mockFail(mock.lineNumbers[invocationIndex], methodName, "on Invocation #" + stri(invocationIndex).trim() + ", expected arg #" + stri(i).trim() + "  to be '" + Common.asString(expected) + "' got '" + Common.asString(value) + "')")
+                m.cleanMocks()
+                return
+              end if
+            end if
+          end for
+        end for
+      end if
+    end for
+
+    m.cleanMocks()
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name cleanMocks
+  '  * @function
+  '  * @instance
+  '  * @description Cleans up all tracking data associated with mocks
+  '  */
+  public function cleanMocks() as void
+    if m.mocks = invalid then return
+    for each id in m.mocks
+      mock = m.mocks[id]
+      mock.target.__mocks = invalid
+    end for
+    m.mocks = invalid
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name cleanStubs
+  '  * @function
+  '  * @instance
+  '  * @description Cleans up all tracking data associated with stubs
+  '  */
+  public function cleanStubs() as void
+    if m.stubs = invalid then return
+    for each id in m.stubs
+      stub = m.stubs[id]
+      stub.target.__stubs = invalid
+    end for
+    m.stubs = invalid
+  end function
+
+
+  public function mockFail(lineNumber, methodName, message) as dynamic
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    m.currentResult.addMockResult(lineNumber, "mock failure on '" + methodName + "' : " + message)
+    return m.getLegacyCompatibleReturnValue(false)
+  end function
+
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '++ Fake Stub callback functions - this is required to get scope
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  public function stubCallback0(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__Stubs["0"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function stubCallback1(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__Stubs["1"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function stubCallback2(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__Stubs["2"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+
+  public function stubCallback3(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__Stubs["3"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+
+  public function stubCallback4(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__Stubs["4"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+
+  public function stubCallback5(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__Stubs["5"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '++ Fake Mock callback functions - this is required to get scope
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  public function mockCallback0(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["0"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback1(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["1"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback2(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["2"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback3(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["3"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback4(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["4"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback5(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["5"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback6(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["6"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback7(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["7"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback8(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["8"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback9(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["9"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback10(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["10"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback11(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["11"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback12(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["12"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback13(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["13"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback14(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["14"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback15(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["15"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback16(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["16"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback17(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["17"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback18(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["18"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback19(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["19"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback20(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["20"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback21(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["21"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback22(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["22"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback23(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["23"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+  public function mockCallback24(arg1 = invalid, arg2 = invalid, arg3 = invalid, arg4 = invalid, arg5 = invalid, arg6 = invalid, arg7 = invalid, arg8 = invalid, arg9 = invalid)as dynamic
+    fake = m.__mocks["24"]
+    return fake.callback(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
+  end function
+
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '++ Utility functions!
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '*************************************************************
+  '** ripped and adapted from rodash - thanks @veeta!
+  '** used by get method - consider thsis private
+  '*************************************************************
+  public function pathAsArray_(path)
+    pathRE = CreateObject("roRegex", "\[([0-9]+)\]", "i")
+    segments = []
+    if type(path) = "String" or type(path) = "roString"
+      dottedPath = pathRE.replaceAll(path, ".\1")
+      stringSegments = dottedPath.tokenize(".")
+      for each s in stringSegments
+        if (Asc(s) >= 48) and (Asc(s) <= 57)
+          segments.push(s.toInt())
+        else
+          segments.push(s)
+        end if
+      end for
+    else if type(path) = "roList" or type(path) = "roArray"
+      stringPath = ""
+      for each s in path
+        stringPath = stringPath + "." + Box(s).toStr()
+      end for
+      segments = m.pathAsArray_(stringPath)
+    else
+      segments = invalid
+    end if
+    return segments
+  end function
+
+  ' /**
+  '  * @memberof module:BaseTestSuite
+  '  * @name g
+  '  * @function
+  '  * @instance
+  '  * @description ripped and adapted from rodash - thanks @veeta!
+  '  * use this method to safely get anything. useful for when unit testing a collection
+  '  * or something and you're not sure if it's gonna crash!
+  '  * @param {Dynamic} aa - node, array or assoArray
+  '  * @param {Dynamic} subset - the items to check for
+  '  * @param {Dynamic} path -as string path to target field. Can use .0. or [0] index notation e.g. "children.0.title" or "children[0].title"
+  '  * @returns {dynamic} - matched item, on aa at path
+  ' */
+
+  public function g(aa, path, default = invalid)
+    if type(aa) <> "roAssociativeArray" and type(aa) <> "roArray" and type(aa) <> "roSGNode" then return default
+    segments = m.pathAsArray_(path)
+
+    if (Type(path) = "roInt" or Type(path) = "roInteger" or Type(path) = "Integer")
+      path = stri(path).trim()
+    end if
+
+    if segments = invalid then return default
+    result = invalid
+
+    while segments.count() > 0
+      key = segments.shift()
+      if (type(key) = "roInteger") 'it's a valid index
+        if (aa <> invalid and GetInterface(aa, "ifArray") <> invalid)
+          value = aa[key]
+        else if (aa <> invalid and GetInterface(aa, "ifSGNodeChildren") <> invalid)
+          value = aa.getChild(key)
+        else if (aa <> invalid and GetInterface(aa, "ifAssociativeArray") <> invalid)
+          key = str(key)
+          if not aa.doesExist(key)
+            exit while
+          end if
+
+          value = aa.lookup(key)
+        else
+          value = invalid
+        end if
+      else
+        if not aa.doesExist(key)
+          exit while
+        end if
+
+        value = aa.lookup(key)
+      end if
+
+      if segments.count() = 0
+        result = value
+        exit while
+      end if
+
+      if type(value) <> "roAssociativeArray" and type(value) <> "roArray" and type(value) <> "roSGNode"
+        exit while
+      end if
+      aa = value
+    end while
+
+    if result = invalid then return default
+    return result
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '++ crude async support
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  ' /**
+  '  * @member waitForField
+  '  * @memberof module:TestUtils
+  '  * @instance
+  '  * @function
+  '  * @description observeField doesn't work in regular unit tests, so we have to wait for the result. We can use this to wait for a network task, foe example, and pass the result directly to a handler. Note - we wait for the value TO CHANGE - so make sure that will be the case, or you'll get stuck forever :)
+  '  * @param {any} target to observe
+  '  * @param {string} field to observe
+  '  * @param {int} delay for each wait
+  '  * @param {int} max attempts
+  '  */
+  function waitForField(target, fieldName, delay = 500, maxAttempts = 10)
+    attempts = 0
+    if target = invalid
+      return false
+    end if
+
+    initialValue = target[fieldName]
+    while target[fieldName] = initialValue
+      port = CreateObject("roMessagePort")
+      wait(delay, port)
+      attempts++
+      if attempts = maxAttempts
+        return false
+      end if
+      ? "waiting for signal field '" ; fieldName "' - " ; attempts
+    end while
+
+    return true
+  end function
+
+  public function assertAsyncField(target, fieldName, delay = 500, maxAttempts = 10)
+    if m.currentResult.isFail then return m.getLegacyCompatibleReturnValue(false)
+    if target = invalid
+      m.fail("Target was invalid")
+    end if
+
+    result = m.waitForField(target, fieldName, delay, maxAttempts)
+    if not result
+      return m.fail("Timeout waiting for targetField " + fieldName + " to be set on target")
+    end if
+
+    m.currentResult.addResult("")
+    return m.getLegacyCompatibleReturnValue(true)
+  end function
+
+end class
\ No newline at end of file
diff --git a/src/CommonUtils.bs b/src/source/CommonUtils.bs
similarity index 80%
rename from src/CommonUtils.bs
rename to src/source/CommonUtils.bs
index 5e426ec8..aadd6197 100755
--- a/src/CommonUtils.bs
+++ b/src/source/CommonUtils.bs
@@ -1,4 +1,4 @@
-namespace Rooibos.Common
+namespace Common
   ' /**
   '  * @module CommonUtils
   '  */
@@ -15,7 +15,7 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if value contains XMLElement interface, else return false
   '  */
   function isXmlElement(value) as boolean
-    return Rooibos.Common.isValid(value) and GetInterface(value, "ifXMLElement") <> invalid
+    return Common.isValid(value) and GetInterface(value, "ifXMLElement") <> invalid
   end function
 
   ' /**
@@ -27,12 +27,12 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if value contains Function interface, else return false
   '  */
   function isFunction(value) as boolean
-    return Rooibos.Common.isValid(value) and GetInterface(value, "ifFunction") <> invalid
+    return Common.isValid(value) and GetInterface(value, "ifFunction") <> invalid
   end function
 
 
   ' /**
-  '  * @name Rooibos.Common.getFunction
+  '  * @name Common.getFunction
   '  * @function
   '  * @description looks up the function by name, for the function map
   '  * @memberof module:CommonUtils
@@ -41,8 +41,8 @@ namespace Rooibos.Common
   '  * @returns {Function} - function pointer or invalid
   '  */
   function getFunction(filename, functionName) as object
-    if (not Rooibos.Common.isNotEmptyString(functionName)) then return invalid
-    if (not Rooibos.Common.isNotEmptyString(filename)) then return invalid
+    if (not Common.isNotEmptyString(functionName)) then return invalid
+    if (not Common.isNotEmptyString(filename)) then return invalid
     'bs:disable-next-line
     mapFunction = RBSFM_getFunctionsForFile(filename)
     if mapFunction <> invalid
@@ -59,7 +59,7 @@ namespace Rooibos.Common
   end function
 
   ' /**
-  '  * @name Rooibos.Common.getFunctionBruteforce
+  '  * @name Common.getFunctionBruteforce
   '  * @function
   '  * @description looks up the function by name, from any function map
   '  *            in future
@@ -69,7 +69,7 @@ namespace Rooibos.Common
   '  * @returns {Function} - function pointer or invalid
   '  */
   function getFunctionBruteForce(functionName) as object
-    if (not Rooibos.Common.isNotEmptyString(functionName)) then return invalid
+    if (not Common.isNotEmptyString(functionName)) then return invalid
     'bs:disable-next-line
     filenames = RBSFM_getFilenames()
     for i = 0 to filenames.count() - 1
@@ -99,7 +99,7 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if value contains Boolean interface, else return false
   '  */
   function isBoolean(value) as boolean
-    return Rooibos.Common.isValid(value) and GetInterface(value, "ifBoolean") <> invalid
+    return Common.isValid(value) and GetInterface(value, "ifBoolean") <> invalid
   end function
 
   ' /**
@@ -111,7 +111,7 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if value type equals Integer, else return false
   '  */
   function isInteger(value) as boolean
-    return Rooibos.Common.isValid(value) and GetInterface(value, "ifInt") <> invalid and (Type(value) = "roInt" or Type(value) = "roInteger" or Type(value) = "Integer")
+    return Common.isValid(value) and GetInterface(value, "ifInt") <> invalid and (Type(value) = "roInt" or Type(value) = "roInteger" or Type(value) = "Integer")
   end function
 
   ' /**
@@ -123,7 +123,7 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if value contains Float interface, else return false
   '  */
   function isFloat(value) as boolean
-    return Rooibos.Common.isValid(value) and GetInterface(value, "ifFloat") <> invalid
+    return Common.isValid(value) and GetInterface(value, "ifFloat") <> invalid
   end function
 
   ' /**
@@ -135,7 +135,7 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if value contains Double interface, else return false
   '  */
   function isDouble(value) as boolean
-    return Rooibos.Common.isValid(value) and GetInterface(value, "ifDouble") <> invalid
+    return Common.isValid(value) and GetInterface(value, "ifDouble") <> invalid
   end function
 
   ' /**
@@ -147,7 +147,7 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if value contains LongInteger interface, else return false
   '  */
   function isLongInteger(value) as boolean
-    return Rooibos.Common.isValid(value) and GetInterface(value, "ifLongInt") <> invalid
+    return Common.isValid(value) and GetInterface(value, "ifLongInt") <> invalid
   end function
 
   ' /**
@@ -159,7 +159,7 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if value is number, else return false
   '  */
   function isNumber(value) as boolean
-    return Rooibos.Common.isLongInteger(value) or Rooibos.Common.isDouble(value) or Rooibos.Common.isInteger(value) or Rooibos.Common.isFloat(value)
+    return Common.isLongInteger(value) or Common.isDouble(value) or Common.isInteger(value) or Common.isFloat(value)
   end function
 
   ' /**
@@ -171,7 +171,7 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if value contains List interface, else return false
   '  */
   function isList(value) as boolean
-    return Rooibos.Common.isValid(value) and GetInterface(value, "ifList") <> invalid
+    return Common.isValid(value) and GetInterface(value, "ifList") <> invalid
   end function
 
   ' /**
@@ -183,7 +183,7 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if value contains Array interface, else return false
   '  */
   function isArray(value) as boolean
-    return Rooibos.Common.isValid(value) and GetInterface(value, "ifArray") <> invalid
+    return Common.isValid(value) and GetInterface(value, "ifArray") <> invalid
   end function
 
   ' /**
@@ -195,7 +195,7 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if value contains AssociativeArray interface, else return false
   '  */
   function isAssociativeArray(value) as boolean
-    return Rooibos.Common.isValid(value) and GetInterface(value, "ifAssociativeArray") <> invalid
+    return Common.isValid(value) and GetInterface(value, "ifAssociativeArray") <> invalid
   end function
 
   ' /**
@@ -207,7 +207,7 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if value contains SGNodeChildren interface, else return false
   '  */
   function isSGNode(value) as boolean
-    return Rooibos.Common.isValid(value) and GetInterface(value, "ifSGNodeChildren") <> invalid
+    return Common.isValid(value) and GetInterface(value, "ifSGNodeChildren") <> invalid
   end function
 
   ' /**
@@ -219,7 +219,7 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if value contains String interface, else return false
   '  */
   function isString(value) as boolean
-    return Rooibos.Common.isValid(value) and GetInterface(value, "ifString") <> invalid
+    return Common.isValid(value) and GetInterface(value, "ifString") <> invalid
   end function
 
   ' /**
@@ -231,7 +231,7 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if value contains String interface and length more 0, else return false
   '  */
   function isNotEmptyString(value) as boolean
-    return Rooibos.Common.isString(value) and len(value) > 0
+    return Common.isString(value) and len(value) > 0
   end function
 
   ' /**
@@ -243,7 +243,7 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if value contains DateTime interface, else return false
   '  */
   function isDateTime(value) as boolean
-    return Rooibos.Common.isValid(value) and (GetInterface(value, "ifDateTime") <> invalid or Type(value) = "roDateTime")
+    return Common.isValid(value) and (GetInterface(value, "ifDateTime") <> invalid or Type(value) = "roDateTime")
   end function
 
   ' /**
@@ -255,7 +255,7 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if value initialized and not equal invalid, else return false
   '  */
   function isValid(value) as boolean
-    return not Rooibos.Common.isUndefined(value) and value <> invalid
+    return not Common.isUndefined(value) and value <> invalid
   end function
 
   function isUndefined(value) as boolean
@@ -287,13 +287,13 @@ namespace Rooibos.Common
   '  * @returns {String} - converted string
   '  */
   function asString(input) as string
-    if Rooibos.Common.isValid(input) = false
+    if Common.isValid(input) = false
       return "Invalid"
-    else if Rooibos.Common.isString(input)
+    else if Common.isString(input)
       return input
-    else if Rooibos.Common.isInteger(input) or Rooibos.Common.isLongInteger(input) or Rooibos.Common.isBoolean(input)
+    else if Common.isInteger(input) or Common.isLongInteger(input) or Common.isBoolean(input)
       return input.ToStr()
-    else if Rooibos.Common.isFloat(input) or Rooibos.Common.isDouble(input)
+    else if Common.isFloat(input) or Common.isDouble(input)
       return Str(input).Trim()
     else if type(input) = "roSGNode"
       return "Node(" + input.subType() + ")"
@@ -306,12 +306,12 @@ namespace Rooibos.Common
       end if
       for each key in input
         if key <> "__mocks" and key <> "__stubs"
-          text = text + key + ":" + Rooibos.Common.asString(input[key])
+          text = text + key + ":" + Common.asString(input[key])
         end if
       end for
       text = text + "}"
       return text
-    else if Rooibos.Common.isFunction(input)
+    else if Common.isFunction(input)
       return input.toStr()
     else
       return ""
@@ -327,13 +327,13 @@ namespace Rooibos.Common
   '  * @returns {Integer} - converted Integer
   '  */
   function asInteger(input) as integer
-    if Rooibos.Common.isValid(input) = false
+    if Common.isValid(input) = false
       return 0
-    else if Rooibos.Common.isString(input)
+    else if Common.isString(input)
       return input.ToInt()
-    else if Rooibos.Common.isInteger(input)
+    else if Common.isInteger(input)
       return input
-    else if Rooibos.Common.isFloat(input) or Rooibos.Common.isDouble(input) or Rooibos.Common.isLongInteger(input)
+    else if Common.isFloat(input) or Common.isDouble(input) or Common.isLongInteger(input)
       return Int(input)
     else
       return 0
@@ -349,11 +349,11 @@ namespace Rooibos.Common
   '  * @returns {Integer} - converted LongInteger
   '  */
   function asLongInteger(input) as longinteger
-    if Rooibos.Common.isValid(input) = false
+    if Common.isValid(input) = false
       return 0
-    else if Rooibos.Common.isString(input)
-      return Rooibos.Common.asInteger(input)
-    else if Rooibos.Common.isLongInteger(input) or Rooibos.Common.isFloat(input) or Rooibos.Common.isDouble(input) or Rooibos.Common.isInteger(input)
+    else if Common.isString(input)
+      return Common.asInteger(input)
+    else if Common.isLongInteger(input) or Common.isFloat(input) or Common.isDouble(input) or Common.isInteger(input)
       return input
     else
       return 0
@@ -369,13 +369,13 @@ namespace Rooibos.Common
   '  * @returns {Float} - converted Float
   '  */
   function asFloat(input) as float
-    if Rooibos.Common.isValid(input) = false
+    if Common.isValid(input) = false
       return 0.0
-    else if Rooibos.Common.isString(input)
+    else if Common.isString(input)
       return input.ToFloat()
-    else if Rooibos.Common.isInteger(input)
+    else if Common.isInteger(input)
       return (input / 1)
-    else if Rooibos.Common.isFloat(input) or Rooibos.Common.isDouble(input) or Rooibos.Common.isLongInteger(input)
+    else if Common.isFloat(input) or Common.isDouble(input) or Common.isLongInteger(input)
       return input
     else
       return 0.0
@@ -391,11 +391,11 @@ namespace Rooibos.Common
   '  * @returns {Float} - converted Double
   '  */
   function asDouble(input) as double
-    if Rooibos.Common.isValid(input) = false
+    if Common.isValid(input) = false
       return 0.0
-    else if Rooibos.Common.isString(input)
-      return Rooibos.Common.asFloat(input)
-    else if Rooibos.Common.isInteger(input) or Rooibos.Common.isLongInteger(input) or Rooibos.Common.isFloat(input) or Rooibos.Common.isDouble(input)
+    else if Common.isString(input)
+      return Common.asFloat(input)
+    else if Common.isInteger(input) or Common.isLongInteger(input) or Common.isFloat(input) or Common.isDouble(input)
       return input
     else
       return 0.0
@@ -411,13 +411,13 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - converted boolean
   '  */
   function asBoolean(input) as boolean
-    if Rooibos.Common.isValid(input) = false
+    if Common.isValid(input) = false
       return false
-    else if Rooibos.Common.isString(input)
+    else if Common.isString(input)
       return LCase(input) = "true"
-    else if Rooibos.Common.isInteger(input) or Rooibos.Common.isFloat(input)
+    else if Common.isInteger(input) or Common.isFloat(input)
       return input <> 0
-    else if Rooibos.Common.isBoolean(input)
+    else if Common.isBoolean(input)
       return input
     else
       return false
@@ -433,8 +433,8 @@ namespace Rooibos.Common
   '  * @returns {Array} - converted array
   '  */
   function asArray(value) as object
-    if Rooibos.Common.isValid(value)
-      if not Rooibos.Common.isArray(value)
+    if Common.isValid(value)
+      if not Common.isArray(value)
         return [value]
       else
         return value
@@ -456,10 +456,10 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if value is null or empty string, else return false
   '  */
   function isNullOrEmpty(value) as boolean
-    if Rooibos.Common.isString(value)
+    if Common.isString(value)
       return Len(value) = 0
     else
-      return not Rooibos.Common.isValid(value)
+      return not Common.isValid(value)
     end if
   end function
 
@@ -479,15 +479,15 @@ namespace Rooibos.Common
   '  * @returns {Integer} - element index if array contains a value, else return -1
   '  */
   function findElementIndexInArray(array, value, compareAttribute = invalid, caseSensitive = false) as integer
-    if Rooibos.Common.isArray(array)
-      for i = 0 to Rooibos.Common.asArray(array).Count() - 1
+    if Common.isArray(array)
+      for i = 0 to Common.asArray(array).Count() - 1
         compareValue = array[i]
 
-        if compareAttribute <> invalid and Rooibos.Common.isAssociativeArray(compareValue)
+        if compareAttribute <> invalid and Common.isAssociativeArray(compareValue)
           compareValue = compareValue.lookupCI(compareAttribute)
         end if
 
-        if Rooibos.Common.eqValues(compareValue, value)
+        if Common.eqValues(compareValue, value)
           return i
         end if
 
@@ -508,7 +508,7 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if array contains a value, else return false
   '  */
   function arrayContains(array, value, compareAttribute = invalid) as boolean
-    return (Rooibos.Common.findElementIndexInArray(array, value, compareAttribute) > -1)
+    return (Common.findElementIndexInArray(array, value, compareAttribute) > -1)
   end function
 
 
@@ -546,7 +546,7 @@ namespace Rooibos.Common
   '  * @returns {Boolean} - true if node contains a value, else return false
   '  */
   function nodeContains(node, value) as boolean
-    return (Rooibos.Common.findElementIndexInNode(node, value) > -1)
+    return (Common.findElementIndexInNode(node, value) > -1)
   end function
 
 
@@ -570,13 +570,13 @@ namespace Rooibos.Common
     end if
 
     if val1Type = "roString" or val1Type = "String"
-      Value1 = Rooibos.Common.asString(Value1)
+      Value1 = Common.asString(Value1)
     else
       Value1 = box(Value1)
     end if
 
     if val2Type = "roString" or val2Type = "String"
-      Value2 = Rooibos.Common.asString(Value2)
+      Value2 = Common.asString(Value2)
     else
       Value2 = box(Value2)
     end if
@@ -598,11 +598,11 @@ namespace Rooibos.Common
       valtype = val1Type
 
       if valtype = "roList"
-        return Rooibos.Common.eqArray(Value1, Value2)
+        return Common.eqArray(Value1, Value2)
       else if valtype = "roAssociativeArray"
-        return Rooibos.Common.eqAssocArray(Value1, Value2)
+        return Common.eqAssocArray(Value1, Value2)
       else if valtype = "roArray"
-        return Rooibos.Common.eqArray(Value1, Value2)
+        return Common.eqArray(Value1, Value2)
       else if (valtype = "roSGNode")
         if (val2Type <> "roSGNode")
           return false
@@ -642,7 +642,7 @@ namespace Rooibos.Common
           else
             v1 = Value1[k]
             v2 = Value2[k]
-            if not Rooibos.Common.eqValues(v1, v2)
+            if not Common.eqValues(v1, v2)
               return false
             end if
           end if
@@ -663,7 +663,7 @@ namespace Rooibos.Common
   '  * @returns {boolean} - True if arrays are equal or False in other case.
   '  */
   function eqArray(Value1, Value2) as dynamic
-    if not (Rooibos.Common.isArray(Value1)) or not Rooibos.Common.isArray(Value2) then return false
+    if not (Common.isArray(Value1)) or not Common.isArray(Value2) then return false
 
     l1 = Value1.Count()
     l2 = Value2.Count()
@@ -674,7 +674,7 @@ namespace Rooibos.Common
       for i = 0 to l1 - 1
         v1 = Value1[i]
         v2 = Value2[i]
-        if not Rooibos.Common.eqValues(v1, v2) then
+        if not Common.eqValues(v1, v2) then
           return false
         end if
       end for
diff --git a/src/Coverage.bs b/src/source/Coverage.bs
similarity index 95%
rename from src/Coverage.bs
rename to src/source/Coverage.bs
index 6b279112..1e563cd0 100644
--- a/src/Coverage.bs
+++ b/src/source/Coverage.bs
@@ -1,4 +1,4 @@
-namespace Rooibos.Coverage
+namespace Coverage
 
   function createLCovOutput()
     ? "Generating lcov.info file..."
@@ -44,7 +44,7 @@ namespace Rooibos.Coverage
     ? "+++++++++++++++++++++++++++++++++++++++++++"
     ?
     ? "+-=-coverage:start"
-    ? Rooibos.Coverage.createLCovOutput()
+    ? Coverage.createLCovOutput()
     ? "+-=-coverage:end"
   end function
 
diff --git a/src/source/ItGroup.bs b/src/source/ItGroup.bs
new file mode 100644
index 00000000..c0b3bebe
--- /dev/null
+++ b/src/source/ItGroup.bs
@@ -0,0 +1,47 @@
+import "pkg:/source/BaseTestSuite.bs"
+import "pkg:/source/CommonUtils.bs"
+
+class ItGroup
+  function new(groupData)
+    for each field in groupData
+      m[field] = groupData[field]
+    end for
+  end function
+
+  function getTestCases() as object
+    if (m.hasSoloTests = true)
+      return m.soloTestCases
+    else
+      return m.testCases
+    end if
+  end function
+
+  function getRunnableTestSuite() as object
+    testCases = Rooibos.ItGroup.getTestCases(group)
+
+    runnableSuite = new BaseTestSuite()
+    runnableSuite.name = group.name
+    runnableSuite.isLegacy = group.isLegacy = true
+    if group.testCaseLookup = invalid
+      group.testCaseLookup = {}
+    end if
+
+    for each testCase in testCases
+      name = testCase.name
+      if (testCase.isSolo = true)
+        name = name + " [SOLO] "
+      end if
+      testFunction = Common.getFunction(m.filename, testCase.funcName)
+      runnableSuite.addTest(name, testFunction, testCase.funcName)
+      m.testCaseLookup[name] = testCase
+    end for
+
+    runnableSuite.SetUp = Common.getFunction(m.filename, m.setupFunctionName)
+    runnableSuite.TearDown = Common.getFunction(m.filename, m.teardownFunctionName)
+    runnableSuite.BeforeEach = Common.getFunction(m.filename, m.beforeEachFunctionName)
+    runnableSuite.AfterEach = Common.getFunction(m.filename, m.afterEachFunctionName)
+
+    return runnableSuite
+  end function
+
+end class
\ No newline at end of file
diff --git a/src/source/Matchers.bs b/src/source/Matchers.bs
new file mode 100644
index 00000000..5c006729
--- /dev/null
+++ b/src/source/Matchers.bs
@@ -0,0 +1,28 @@
+namespace Matcher
+
+  function anyString(value)
+    return Common.isString(value)
+  end function
+
+  function anyBool(value)
+    return Common.isBoolean(value)
+  end function
+
+  function anyNumber(value)
+    return Common.isNumber(value)
+  end function
+
+  function anyAA(value)
+    return Common.isAssociativeArray(value)
+  end function
+
+  function anyArray(value)
+    return Common.isArray(value)
+  end function
+
+  function anyNode(value)
+    return Common.isSGNode(value)
+  end function
+
+
+end namespace
\ No newline at end of file
diff --git a/src/source/NodeMixin.bs b/src/source/NodeMixin.bs
new file mode 100644
index 00000000..ab03e421
--- /dev/null
+++ b/src/source/NodeMixin.bs
@@ -0,0 +1,38 @@
+' /**
+'  * @memberof module:TestRunner
+'  * @name Rooibos_RunNodeTests
+'  * @function
+'  * @instance
+'  * @description interface hook for exeucting tests on nodes. This method is for internal use only. Only the Rooibos framework should invoke this method
+'  * @param {Dynamic} args - associated array, containing all the information required to execute the tests.
+'  * @returns {Object} test stats object, for merging into main test stats
+'  */
+function RunNodeTests(args) as object
+  ? " RUNNING NODE TESTS"
+  totalStatObj = Stats.CreateTotalStatistic()
+
+  TestRunnerMixin.RunItGroups(args.metaTestSuite, totalStatObj, args.testUtilsDecoratorMethodName, args.config, args.runtimeConfig, m)
+  return totalStatObj
+end function
+
+' /**
+'  * @memberof module:TestRunner
+'  * @name CreateTestNode
+'  * @function
+'  * @instance
+'  * @description interface hook for correctly creating nodes that get tested. This ensures they are in the correct scope.
+'  * This method must be defined in your tests scene xml.
+'  * @param {String} nodeType - name of node to create. The framework will pass this in as required
+'  * @returns {Object} the required node, or invalid if it could not be invoked.
+'  */
+function CreateTestNode(nodeType) as object
+  node = createObject("roSGNode", nodeType)
+
+  if (type(node) = "roSGNode" and node.subType() = nodeType)
+    m.top.AppendChild(node)
+    return node
+  else
+    ? " Error creating test node of type " ; nodeType
+    return invalid
+  end if
+end function
diff --git a/src/Rooibos.bs b/src/source/Rooibos.bs
similarity index 93%
rename from src/Rooibos.bs
rename to src/source/Rooibos.bs
index 6862a28f..8063f97f 100644
--- a/src/Rooibos.bs
+++ b/src/source/Rooibos.bs
@@ -1,7 +1,6 @@
 ' /**
 '  * @module rooibos
 '  */
-namespace Rooibos
   ' /**
   '  * @memberof module:rooibos
   '  * @name Rooibos_init
@@ -58,11 +57,11 @@ namespace Rooibos
     rooibosVersion = "#ROOIBOS_VERSION#"
     requiredRooibosPreprocessorVersion = "1.0.0"
 
-    if not Rooibos.Common.isFunction(RBSFM_getPreprocessorVersion)
+    if not Common.isFunction(RBSFM_getPreprocessorVersion)
       versionError = "You are using a rooibos-preprocessor (i.e. rooibos-cli) version older than 1.0.0 - please update to " + requiredRooibosPreprocessorVersion
     else 
       'bs:disable-next-line
-      if Rooibos.versionCompare(RBSFM_getPreprocessorVersion(), requiredRooibosPreprocessorVersion) >= 0
+      if versionCompare(RBSFM_getPreprocessorVersion(), requiredRooibosPreprocessorVersion) >= 0
         versionError = ""
       else
         'bs:disable-next-line
@@ -85,7 +84,7 @@ namespace Rooibos
 
       else
         ? "scene is ready; running tests now"
-        runner = new Rooibos.TestRunner(args)
+        runner = new TestRunner(args)
         runner.Run()
       end if
 
@@ -100,7 +99,7 @@ namespace Rooibos
 
           if msg.getField() = "isReadyToStartTests" and msg.getData() = true
             ? "scene is ready; running tests now"
-            runner = new Rooibos.TestRunner(args)
+            runner = new TestRunner(args)
             runner.Run()
           end if
         end if
@@ -146,6 +145,4 @@ namespace Rooibos
 
     return 0
 
-  end function
-
-end namespace
\ No newline at end of file
+  end function
\ No newline at end of file
diff --git a/src/source/RuntimeConfig.bs b/src/source/RuntimeConfig.bs
new file mode 100644
index 00000000..a504a6bf
--- /dev/null
+++ b/src/source/RuntimeConfig.bs
@@ -0,0 +1,37 @@
+class UnitTestRuntimeConfig
+
+  public hasSoloSuites = false
+  public hasSoloGroups = false
+  public hasSoloTests = false
+
+  public function new()
+    m.suites = m.CreateSuites()
+  end function
+
+  public function createSuites()
+    'bs:disable-next-line
+    suites = RBSFM_getTestSuitesForProject()
+    includedSuites = []
+    for i = 0 to suites.count() - 1
+      suite = suites[i]
+      if (suite.valid)
+        if (suite.isSolo)
+          m.hasSoloSuites = true
+        end if
+        if (suite.hasSoloTests = true)
+          m.hasSoloTests = true
+        end if
+        if (suite.hasSoloGroups = true)
+          m.hasSoloGroups = true
+        end if
+        '          ? "valid - suite"
+        includedSuites.push(suite)
+      else
+        ? "ERROR! suite was not valid - ignoring"
+      end if
+
+    end for
+    return includedSuites
+  end function
+
+end class
\ No newline at end of file
diff --git a/src/Stats.bs b/src/source/Stats.bs
similarity index 89%
rename from src/Stats.bs
rename to src/source/Stats.bs
index 0b41a313..4dec855a 100644
--- a/src/Stats.bs
+++ b/src/source/Stats.bs
@@ -1,4 +1,4 @@
-namespace Rooibos.Stats
+namespace Stats
 
   '----------------------------------------------------------------
   ' Create an empty statistic object for totals in output log.
@@ -21,7 +21,7 @@ namespace Rooibos.Stats
   end function
 
   '*************************************************************
-  '** Rooibos.Stats_MergeTotalStatistic
+  '** Stats_MergeTotalStatistic
   '** merges the stats from stat2 onto stat1
   '** @param param as ObjectP paramdesc
   '** @return ObjectR retdesc
@@ -109,10 +109,10 @@ namespace Rooibos.Stats
   ' @param statTestObj (object) A test statistic to append.
   '----------------------------------------------------------------
   sub AppendTestStatistic(statSuiteObj as object, statTestObj as object)
-    if Rooibos.Common.IsAssociativeArray(statSuiteObj) and Rooibos.Common.IsAssociativeArray(statTestObj)
+    if Common.IsAssociativeArray(statSuiteObj) and Common.IsAssociativeArray(statTestObj)
       statSuiteObj.Tests.Push(statTestObj)
 
-      if Rooibos.Common.IsInteger(statTestObj.time)
+      if Common.IsInteger(statTestObj.time)
         statSuiteObj.Time = statSuiteObj.Time + statTestObj.Time
       end if
 
@@ -136,23 +136,23 @@ namespace Rooibos.Stats
   ' @param statSuiteObj (object) A test suite statistic object to append.
   '----------------------------------------------------------------
   sub AppendSuiteStatistic(statTotalObj as object, statSuiteObj as object)
-    if Rooibos.Common.IsAssociativeArray(statTotalObj) and Rooibos.Common.IsAssociativeArray(statSuiteObj)
+    if Common.IsAssociativeArray(statTotalObj) and Common.IsAssociativeArray(statSuiteObj)
       statTotalObj.Suites.Push(statSuiteObj)
       statTotalObj.Time = statTotalObj.Time + statSuiteObj.Time
 
-      if Rooibos.Common.IsInteger(statSuiteObj.Total)
+      if Common.IsInteger(statSuiteObj.Total)
         statTotalObj.Total = statTotalObj.Total + statSuiteObj.Total
       end if
 
-      if Rooibos.Common.IsInteger(statSuiteObj.Correct)
+      if Common.IsInteger(statSuiteObj.Correct)
         statTotalObj.Correct = statTotalObj.Correct + statSuiteObj.Correct
       end if
 
-      if Rooibos.Common.IsInteger(statSuiteObj.Fail)
+      if Common.IsInteger(statSuiteObj.Fail)
         statTotalObj.Fail = statTotalObj.Fail + statSuiteObj.Fail
       end if
 
-      if Rooibos.Common.IsInteger(statSuiteObj.Crash)
+      if Common.IsInteger(statSuiteObj.Crash)
         statTotalObj.Crash = statTotalObj.Crash + statSuiteObj.Crash
       end if
 
diff --git a/src/source/TestCase.bs b/src/source/TestCase.bs
new file mode 100644
index 00000000..5e101cae
--- /dev/null
+++ b/src/source/TestCase.bs
@@ -0,0 +1,36 @@
+class UnitTestCase
+
+  public isSolo
+  public func
+  public funcName
+  public isIgnored
+  public name
+  public lineNumber
+  public paramLineNumber
+  public assertIndex = 0
+  'Map with which the testsuite processor can take the index of a an assert line, and map it to the line Number
+  public assertLineNumberMap = {}
+  public getTestLineIndex = 0
+  public rawParams
+  public paramTestIndex
+  public isParamTest = false
+  public time = 0
+
+  public function new(name as string, func as dynamic, funcName as string, isSolo as boolean, isIgnored as boolean, lineNumber as integer, params = invalid, paramTestIndex = 0, paramLineNumber = 0)
+    m.isSolo = isSolo
+    m.func = func
+    m.funcName = funcName
+    m.isIgnored = isIgnored
+    m.name = name
+    m.lineNumber = lineNumber
+    m.paramLineNumber = paramLineNumber
+    m.rawParams = params
+    m.paramTestIndex = paramTestIndex
+
+    if (params <> invalid)
+      m.name = m.name + stri(m.paramTestIndex)
+    end if
+
+    return this
+  end function
+end class
\ No newline at end of file
diff --git a/src/source/TestLogger.bs b/src/source/TestLogger.bs
new file mode 100644
index 00000000..7fdf7872
--- /dev/null
+++ b/src/source/TestLogger.bs
@@ -0,0 +1,228 @@
+class Logger
+
+  public function new(config)
+    m.config = config
+
+    m.verbosityLevel = {
+      basic: 0
+      normal: 1
+      verbose: 2
+    }
+
+    m.verbosity = m.config.logLevel
+  end function
+
+  '----------------------------------------------------------------
+  ' Print statistic object with specified verbosity.
+  '
+  ' @param statObj (object) A statistic object to print.
+  '----------------------------------------------------------------
+  public sub printStatistic(statObj as object)
+    m.PrintStart()
+    previousfile = invalid
+
+    for each testSuite in statObj.Suites
+      if (not statObj.testRunHasFailures or ((not m.config.showOnlyFailures) or testSuite.fail > 0 or testSuite.crash > 0))
+        if (testSuite.metaTestSuite.filePath <> previousfile)
+          m.PrintMetaSuiteStart(testSuite.metaTestSuite)
+          previousfile = testSuite.metaTestSuite.filePath
+        end if
+        m.PrintSuiteStatistic(testSuite, statObj.testRunHasFailures)
+      end if
+    end for
+
+    ? ""
+    m.PrintEnd()
+    'bs:disable-next-line
+    ignoredInfo = RBSFM_getIgnoredTestInfo()
+    ? "Total  = "; Common.AsString(statObj.Total); " ; Passed  = "; statObj.Correct; " ; Failed   = "; statObj.Fail; " ; Ignored   = "; ignoredInfo.count
+    ? " Time spent: "; statObj.Time; "ms"
+    ? ""
+    ? ""
+    if (ignoredInfo.count > 0)
+      ? "IGNORED TESTS:"
+      for each ignoredItemName in ignoredInfo.items
+        print ignoredItemName
+      end for
+    end if
+
+    if (statObj.ignored > 0)
+      ? "IGNORED TESTS:"
+      for each ignoredItemName in statObj.IgnoredTestNames
+        print ignoredItemName
+      end for
+    end if
+
+    if (statObj.Total = statObj.Correct)
+      overrallResult = "Success"
+    else
+      overrallResult = "Fail"
+    end if
+    ? "RESULT: "; overrallResult
+
+  end sub
+
+  '----------------------------------------------------------------
+  ' Print test suite statistic.
+  '
+  ' @param statSuiteObj (object) A target test suite object to print.
+  '----------------------------------------------------------------
+  public sub printSuiteStatistic(statSuiteObj as object, hasFailures)
+    m.PrintSuiteStart(statSuiteObj.Name)
+
+    for each testCase in statSuiteObj.Tests
+      if (not hasFailures or ((not m.config.showOnlyFailures) or testCase.Result <> "Success"))
+        m.PrintTestStatistic(testCase)
+      end if
+    end for
+
+    ? " |"
+  end sub
+
+  public sub printTestStatistic(testCase as object)
+    metaTestCase = testCase.metaTestCase
+
+    if (LCase(testCase.Result) <> "success")
+      testChar = "-"
+      if metaTestCase.testResult.failedMockLineNumber > -1
+        lineNumber = metaTestCase.testResult.failedMockLineNumber
+      else
+        assertIndex = metaTestCase.testResult.failedAssertIndex
+        lineNumber = Common.getAssertLine(metaTestCase, assertIndex)
+      end if
+      if lineNumber <> invalid
+        locationLine = StrI(lineNumber).trim()
+      else
+        locationLine = StrI(metaTestCase.lineNumber).trim()
+      end if
+
+    else
+      testChar = "|"
+      locationLine = StrI(metaTestCase.lineNumber).trim()
+    end if
+    locationText = "pkg:/" + testCase.filePath.trim() + "(" + locationLine + ")"
+
+    if m.config.printTestTimes = true
+      timeText = " (" + stri(metaTestCase.time).trim() + "ms)"
+    else
+      timeText = ""
+    end if
+
+    insetText = ""
+    if (metaTestcase.isParamTest <> true)
+      messageLine = Common.fillText(" " + testChar + " |--" + metaTestCase.Name + " : ", ".", 80)
+      ? messageLine ; testCase.Result ; timeText
+    else if (metaTestcase.paramTestIndex = 0)
+      name = metaTestCase.Name
+      if (len(name) > 1 and right(name, 1) = "0")
+        name = left(name, len(name) - 1)
+      end if
+      ? " " + testChar + " |--" + name + " : "
+    end if
+
+    if (metaTestcase.isParamTest = true)
+      insetText = "  "
+
+      if type(metaTestCase.rawParams) = "roAssociativeArray"
+        rawParams = {}
+        for each key in metaTestCase.rawParams
+          if type(metaTestCase.rawParams[key]) <> "Function" and type(metaTestCase.rawParams[key]) <> "roFunction"
+            rawParams[key] = metaTestCase.rawParams[key]
+          end if
+        end for
+      else
+        rawParams = metaTestCase.rawParams
+      end if
+      messageLine = Common.fillText(" " + testChar + insetText + " |--" + formatJson(rawParams) + " : ", ".", 80)
+      ? messageLine ; testCase.Result ; timeText
+    end if
+
+    if LCase(testCase.Result) <> "success"
+      ? " | "; insettext ;"  |--Location: "; locationText
+      if (metaTestcase.isParamTest = true)
+        ? " | "; insettext ;"  |--Param Line: "; StrI(metaTestCase.paramlineNumber).trim()
+      end if
+      ? " | "; insettext ;"  |--Error Message: "; testCase.Error.Message
+    end if
+  end sub
+
+  '----------------------------------------------------------------
+  ' Print testting start message.
+  '----------------------------------------------------------------
+  public sub printStart()
+    ? ""
+    ? "[START TEST REPORT]"
+    ? ""
+  end sub
+
+  '----------------------------------------------------------------
+  ' Print testing end message.
+  '----------------------------------------------------------------
+  public sub printEnd()
+    ? ""
+    ? "[END TEST REPORT]"
+    ? ""
+  end sub
+
+  '----------------------------------------------------------------
+  ' Print test suite SetUp message.
+  '----------------------------------------------------------------
+  public sub printSuiteSetUp(sName as string)
+    if m.verbosity = m.verbosityLevel.verbose
+      ? "================================================================="
+      ? "===   SetUp "; sName; " suite."
+      ? "================================================================="
+    end if
+  end sub
+
+
+  '----------------------------------------------------------------
+  ' Print test suite start message.
+  '----------------------------------------------------------------
+
+  public sub printMetaSuiteStart(metaTestSuite)
+    ? metaTestSuite.name; " " ; "pkg:/" ; metaTestSuite.filePath + "(1)"
+  end sub
+
+  '----------------------------------------------------------------
+  ' Print '@It group start message.
+  '----------------------------------------------------------------
+  public sub printSuiteStart(sName as string)
+    '  ? "It "; sName
+    ? " |-" ; sName
+    '  ? ""
+  end sub
+
+  '----------------------------------------------------------------
+  ' Print test suite TearDown message.
+  '----------------------------------------------------------------
+  public sub printSuiteTearDown(sName as string)
+    if m.verbosity = m.verbosityLevel.verbose
+      ? "================================================================="
+      ? "===   TearDown "; sName; " suite."
+      ? "================================================================="
+    end if
+  end sub
+
+  '----------------------------------------------------------------
+  ' Print test setUp message.
+  '----------------------------------------------------------------
+  public sub printTestSetUp(tName as string)
+    if m.verbosity = m.verbosityLevel.verbose
+      ? "----------------------------------------------------------------"
+      ? "---   SetUp "; tName; " test."
+      ? "----------------------------------------------------------------"
+    end if
+  end sub
+
+  '----------------------------------------------------------------
+  ' Print test TearDown message.
+  '----------------------------------------------------------------
+  public sub printTestTearDown(tName as string)
+    if m.verbosity = m.verbosityLevel.verbose
+      ? "----------------------------------------------------------------"
+      ? "---   TearDown "; tName; " test."
+      ? "----------------------------------------------------------------"
+    end if
+  end sub
+end class
\ No newline at end of file
diff --git a/src/TestRunner.bs b/src/source/TestRunner.bs
similarity index 54%
rename from src/TestRunner.bs
rename to src/source/TestRunner.bs
index 448264c0..d823df66 100644
--- a/src/TestRunner.bs
+++ b/src/source/TestRunner.bs
@@ -1,176 +1,175 @@
-namespace Rooibos
-  ' /**
-  '  * @module TestRunner
-  '  */
+' /**
+'  * @module TestRunner
+'  */
+
+' /**
+'  * @memberof module:TestRunner
+'  * @name Rooibos_TestRunner
+'  * @function
+'  * @description Creates an instance of the test runner
+'  * @param {Dynamic} args - contains the application launch args, and other settings required for test execution
+'  */
+class TestRunner
+  private RunItGroups = TestRunnerMixin_runItGroups
+  private RunTestCases = TestRunnerMixin_runTestCases
+
+  public function new(args = {})
+    m.testScene = args.testScene
+    m.nodeContext = args.nodeContext
+
+    'bs:disable-next-line
+    config = RBSFM_getRuntimeConfig()
+    if (config = invalid or not Common.isAssociativeArray(config))
+      ? "WARNING : specified config is invalid - using default"
+      config = {
+        showOnlyFailures: false
+        failFast: false
+      }
+    end if
 
-  ' /**
-  '  * @memberof module:TestRunner
-  '  * @name Rooibos_TestRunner
-  '  * @function
-  '  * @description Creates an instance of the test runner
-  '  * @param {Dynamic} args - contains the application launch args, and other settings required for test execution
-  '  */
-  class TestRunner
-    private RunItGroups = Rooibos_TestRunnerMixin_RunItGroups
-    private RunTestCases = Rooibos_TestRunnerMixin_RunTestCases
+    'mix in parsed in args
+    if (args.showOnlyFailures <> invalid)
+      config.showOnlyFailures = args.showOnlyFailures = "true"
+    end if
 
-    public function new(args = {})
-      m.testScene = args.testScene
-      m.nodeContext = args.nodeContext
+    if (args.failFast <> invalid)
+      config.failFast = args.failFast = "true"
+    end if
 
-      'bs:disable-next-line
-      config = RBSFM_getRuntimeConfig()
-      if (config = invalid or not Rooibos.Common.isAssociativeArray(config))
-        ? "WARNING : specified config is invalid - using default"
-        config = {
-          showOnlyFailures: false
-          failFast: false
-        }
-      end if
+    m.testUtilsDecoratorMethodName = args.testUtilsDecoratorMethodName
+    m.config = config
 
-      'mix in parsed in args
-      if (args.showOnlyFailures <> invalid)
-        config.showOnlyFailures = args.showOnlyFailures = "true"
-      end if
+    ' Internal properties
+    m.config.testsDirectory = config.testsDirectory
 
-      if (args.failFast <> invalid)
-        config.failFast = args.failFast = "true"
-      end if
+    m.logger = new Logger(m.config)
+    m.global = args.global
+  end function
 
-      m.testUtilsDecoratorMethodName = args.testUtilsDecoratorMethodName
-      m.config = config
-
-      ' Internal properties
-      m.config.testsDirectory = config.testsDirectory
-
-      m.logger = new Rooibos.Logger(m.config)
-      m.global = args.global
-    end function
-
-    ' /**
-    '  * @memberof module:TestRunner
-    '  * @name Run
-    '  * @function
-    '  * @instance
-    '  * @description Executes all tests for a project, as per the config
-    '  */
-    public sub run()
-      if type(RBSFM_getTestSuitesForProject) <> "Function"
-        ? " ERROR! RBSFM_getTestSuitesForProject is not found! That looks like you didn't run the preprocessor as part of your test process. Please refer to the docs."
-        return
-      end if
+  ' /**
+  '  * @memberof module:TestRunner
+  '  * @name Run
+  '  * @function
+  '  * @instance
+  '  * @description Executes all tests for a project, as per the config
+  '  */
+  public sub run()
+    if type(RBSFM_getTestSuitesForProject) <> "Function"
+      ? " ERROR! RBSFM_getTestSuitesForProject is not found! That looks like you didn't run the preprocessor as part of your test process. Please refer to the docs."
+      return
+    end if
 
-      totalStatObj = Rooibos.Stats.createTotalStatistic()
-      m.runtimeConfig = new Rooibos.UnitTestRuntimeConfig()
-      m.runtimeConfig.global = m.global
-      totalStatObj.testRunHasFailures = false
+    totalStatObj = Stats.createTotalStatistic()
+    m.runtimeConfig = new UnitTestRuntimeConfig()
+    m.runtimeConfig.global = m.global
+    totalStatObj.testRunHasFailures = false
 
-      for each metaTestSuite in m.runtimeConfig.suites
-        if (m.runtimeConfig.hasSoloTests = true)
-          if (metaTestSuite.hasSoloTests <> true)
-            if (m.config.logLevel = 2)
-              ? "TestSuite " ; metaTestSuite.name ; " Is filtered because it has no solo tests"
-            end if
-            goto skipSuite
-          end if
-        else if (m.runtimeConfig.hasSoloSuites)
-          if (metaTestSuite.isSolo <> true)
-            if (m.config.logLevel = 2)
-              ? "TestSuite " ; metaTestSuite.name ; " Is filtered due to solo flag"
-            end if
-            goto skipSuite
+    for each metaTestSuite in m.runtimeConfig.suites
+      if (m.runtimeConfig.hasSoloTests = true)
+        if (metaTestSuite.hasSoloTests <> true)
+          if (m.config.logLevel = 2)
+            ? "TestSuite " ; metaTestSuite.name ; " Is filtered because it has no solo tests"
           end if
+          goto skipSuite
         end if
-
-        if (metaTestSuite.isIgnored = true)
+      else if (m.runtimeConfig.hasSoloSuites)
+        if (metaTestSuite.isSolo <> true)
           if (m.config.logLevel = 2)
-            ? "Ignoring TestSuite " ; metaTestSuite.name ; " Due to Ignore flag"
+            ? "TestSuite " ; metaTestSuite.name ; " Is filtered due to solo flag"
           end if
-          totalstatobj.ignored++
-          totalStatObj.IgnoredTestNames.push("|-" + metaTestSuite.name + " [WHOLE SUITE]")
-
           goto skipSuite
         end if
-        ? ""
-        ? Rooibos.Common.fillText("> SUITE: " + metaTestSuite.name, ">", 80)
-
-        if (metaTestSuite.isNodeTest = true and metaTestSuite.nodeTestFileName <> "")
-          ? " +++++RUNNING NODE TEST"
-          nodeType = metaTestSuite.nodeTestFileName
-          ? " node type is " ; nodeType
-
-          node = m.testScene.CallFunc("Rooibos_CreateTestNode", nodeType)
-
-          if (type(node) = "roSGNode" and node.subType() = nodeType)
-            args = {
-              "metaTestSuite": metaTestSuite
-              "testUtilsDecoratorMethodName": m.testUtilsDecoratorMethodName
-              "config": m.config
-              "runtimeConfig": m.runtimeConfig
-            }
-            nodeStatResults = node.callFunc("Rooibos_RunNodeTests", args)
-            if nodeStatResults <> invalid
-              Rooibos.Stats.mergeTotalStatistic(totalStatObj, nodeStatResults)
-            else
-              ? " ERROR! The node "; nodeType; " did not return stats from the Rooibos_RunNodeTests method. This usually means you are not importing rooibosDist.brs, or rooibosFunctionMap.brs. Please refer to : https://github.com/georgejecook/rooibos/blob/master/docs/index.md#testing-scenegraph-nodes"
-            end if
-            m.testScene.RemoveChild(node)
+      end if
 
+      if (metaTestSuite.isIgnored = true)
+        if (m.config.logLevel = 2)
+          ? "Ignoring TestSuite " ; metaTestSuite.name ; " Due to Ignore flag"
+        end if
+        totalstatobj.ignored++
+        totalStatObj.IgnoredTestNames.push("|-" + metaTestSuite.name + " [WHOLE SUITE]")
+
+        goto skipSuite
+      end if
+      ? ""
+      ? Common.fillText("> SUITE: " + metaTestSuite.name, ">", 80)
+
+      if (metaTestSuite.isNodeTest = true and metaTestSuite.nodeTestFileName <> "")
+        ? " +++++RUNNING NODE TEST"
+        nodeType = metaTestSuite.nodeTestFileName
+        ? " node type is " ; nodeType
+
+        node = m.testScene.CallFunc("rooibos_createTestNode", nodeType)
+
+        if (type(node) = "roSGNode" and node.subType() = nodeType)
+          args = {
+            "metaTestSuite": metaTestSuite
+            "testUtilsDecoratorMethodName": m.testUtilsDecoratorMethodName
+            "config": m.config
+            "runtimeConfig": m.runtimeConfig
+          }
+          nodeStatResults = node.callFunc("rooibos_runNodeTests", args)
+          if nodeStatResults <> invalid
+            Stats.mergeTotalStatistic(totalStatObj, nodeStatResults)
           else
-            ? " ERROR!! - could not create node required to execute tests for " ; metaTestSuite.name
-            ? " Node of type " ; nodeType ; " was not found/could not be instantiated"
+            ? " ERROR! The node "; nodeType; " did not return stats from the rooibos_runNodeTests method. This usually means you are not importing rooibosDist.brs, or rooibosFunctionMap.brs. Please refer to : https://github.com/georgejecook/rooibos/blob/master/docs/index.md#testing-scenegraph-nodes"
           end if
+          m.testScene.RemoveChild(node)
+
         else
-          if (metaTestSuite.hasIgnoredTests)
-            totalStatObj.IgnoredTestNames.push("|-" + metaTestSuite.name)
-          end if
-          m.RunItGroups(metaTestSuite, totalStatObj, m.testUtilsDecoratorMethodName, m.config, m.runtimeConfig, m.nodeContext)
+          ? " ERROR!! - could not create node required to execute tests for " ; metaTestSuite.name
+          ? " Node of type " ; nodeType ; " was not found/could not be instantiated"
         end if
-        skipSuite:
-      end for
-      m.logger.PrintStatistic(totalStatObj)
+      else
+        if (metaTestSuite.hasIgnoredTests)
+          totalStatObj.IgnoredTestNames.push("|-" + metaTestSuite.name)
+        end if
+        m.RunItGroups(metaTestSuite, totalStatObj, m.testUtilsDecoratorMethodName, m.config, m.runtimeConfig, m.nodeContext)
+      end if
+      skipSuite:
+    end for
+    m.logger.PrintStatistic(totalStatObj)
 
-      if Rooibos.Common.isFunction(RBS_ReportCodeCoverage)
-        'bs:disable-next-line
-        RBS_ReportCodeCoverage()
+    if Common.isFunction(RBS_reportCodeCoverage)
+      'bs:disable-next-line
+      RBS_reportCodeCoverage()
 
-        if m.config.printLcov = true
-          Rooibos.Coverage.printLCovInfo()
-        end if
+      if m.config.printLcov = true
+        Coverage.printLCovInfo()
       end if
-      m.sendHomeKeypress()
-    end sub
+    end if
+    m.sendHomeKeypress()
+  end sub
 
 
-    public sub sendHomeKeypress()
-      ut = CreateObject("roUrlTransfer")
-      ut.SetUrl("http://localhost:8060/keypress/Home")
-      ut.PostFromString("")
-    end sub
+  public sub sendHomeKeypress()
+    ut = createObject("roUrlTransfer")
+    ut.SetUrl("http://localhost:8060/keypress/Home")
+    ut.PostFromString("")
+  end sub
 
-  end class
-end namespace
+end class
 
 'TODO convert to namespace when Bron fixes bug that does not allow ns resoluiton on assignment
 ' namespace Rooibos.TestRunnerMixin
 
-sub Rooibos_TestRunnerMixin_RunItGroups(metaTestSuite, totalStatObj, testUtilsDecoratorMethodName, config, runtimeConfig, nodeContext = invalid)
+sub TestRunnerMixin_runItGroups(metaTestSuite, totalStatObj, testUtilsDecoratorMethodName, config, runtimeConfig, nodeContext = invalid)
   if (testUtilsDecoratorMethodName <> invalid)
-    testUtilsDecorator = Rooibos.Common.getFunctionBruteForce(testUtilsDecoratorMethodName)
-    if (not Rooibos.Common.isFunction(testUtilsDecorator))
+    testUtilsDecorator = Common.getFunctionBruteForce(testUtilsDecoratorMethodName)
+    if (not Common.isFunction(testUtilsDecorator))
       ? "[ERROR] Test utils decorator method `" ; testUtilsDecoratorMethodName ;"` was not in scope! for testSuite: " + metaTestSuite.name
     end if
   end if
 
-  for each itGroup in metaTestSuite.itGroups
-    testSuite = Rooibos.ItGroup.GetRunnableTestSuite(itGroup)
+  for each itGroupData in metaTestSuite.itGroups
+    itGroup = new ItGroup(itGroupData)
+    testSuite = itGroup.getRunnableTestSuite()
     if (nodeContext <> invalid)
       testSuite.node = nodeContext
       testSuite.global = nodeContext.global
       testSuite.top = nodeContext.top
     end if
 
-    if (Rooibos.Common.isFunction(testUtilsDecorator))
+    if (Common.isFunction(testUtilsDecorator))
       testUtilsDecorator(testSuite)
     end if
 
@@ -191,7 +190,7 @@ sub Rooibos_TestRunnerMixin_RunItGroups(metaTestSuite, totalStatObj, testUtilsDe
           if (testcase.isParamTest <> true)
             totalStatObj.IgnoredTestNames.push("  | |--" + testCase.name)
           else if (testcase.paramTestIndex = 0)
-            testCaseName = testCase.Name
+            testCaseName = testCase.name
             if (len(testCaseName) > 1 and right(testCaseName, 1) = "0")
               testCaseName = left(testCaseName, len(testCaseName) - 1)
             end if
@@ -221,15 +220,15 @@ sub Rooibos_TestRunnerMixin_RunItGroups(metaTestSuite, totalStatObj, testUtilsDe
       goto skipItGroup
     end if
     ? ""
-    ? Rooibos.Common.fillText("> GROUP: " + itGroup.name, ">", 80)
+    ? Common.fillText("> GROUP: " + itGroup.name, ">", 80)
 
-    if Rooibos.Common.isFunction(testSuite.SetUp)
+    if Common.isFunction(testSuite.SetUp)
       testSuite.SetUp()
     end if
 
-    Rooibos_TestRunnerMixin_RunTestCases(metaTestSuite, itGroup, testSuite, totalStatObj, config, runtimeConfig)
+    TestRunnerMixin_runTestCases(metaTestSuite, itGroup, testSuite, totalStatObj, config, runtimeConfig)
 
-    if Rooibos.Common.isFunction(testSuite.TearDown)
+    if Common.isFunction(testSuite.TearDown)
       testSuite.TearDown()
     end if
 
@@ -240,30 +239,30 @@ sub Rooibos_TestRunnerMixin_RunItGroups(metaTestSuite, totalStatObj, testUtilsDe
   end for
 end sub
 
-sub Rooibos_TestRunnerMixin_RunTestCases(metaTestSuite, itGroup, testSuite, totalStatObj, config, runtimeConfig)
-  suiteStatObj = Rooibos.Stats.createSuiteStatistic(itGroup.Name)
+sub TestRunnerMixin_runTestCases(metaTestSuite, itGroup, testSuite, totalStatObj, config, runtimeConfig)
+  suiteStatObj = Stats.createSuiteStatistic(itGroup.name)
   testSuite.global = runtimeConfig.global
 
   for each testCase in testSuite.testCases
-    metaTestCase = itGroup.testCaseLookup[testCase.Name]
+    metaTestCase = itGroup.testCaseLookup[testCase.name]
     metaTestCase.time = 0
     if (runtimeConfig.hasSoloTests and not metaTestCase.isSolo)
       goto skipTestCase
     end if
     ? ""
-    ? Rooibos.Common.fillText("> TEST: " + testCase.Name + " ", ">", 80)
+    ? Common.fillText("> TEST: " + testCase.name + " ", ">", 80)
 
-    if Rooibos.Common.isFunction(testSuite.beforeEach)
+    if Common.isFunction(testSuite.beforeEach)
       testSuite.beforeEach()
     end if
 
-    testTimer = CreateObject("roTimespan")
-    testCaseTimer = CreateObject("roTimespan")
-    testStatObj = Rooibos.Stats.createTestStatistic(testCase.Name)
+    testTimer = createObject("roTimespan")
+    testCaseTimer = createObject("roTimespan")
+    testStatObj = Stats.createTestStatistic(testCase.name)
     testSuite.testCase = testCase.Func
     testStatObj.filePath = metaTestSuite.filePath
     testStatObj.metaTestCase = metaTestCase
-    testSuite.currentResult = new Rooibos.UnitTestResult()
+    testSuite.currentResult = new UnitTestResult()
 
     testStatObj.metaTestCase.testResult = testSuite.currentResult
 
@@ -337,9 +336,9 @@ sub Rooibos_TestRunnerMixin_RunTestCases(metaTestSuite, itGroup, testSuite, tota
     end if
 
     testStatObj.time = testTimer.totalMilliseconds()
-    Rooibos.Stats.appendTestStatistic(suiteStatObj, testStatObj)
+    Stats.appendTestStatistic(suiteStatObj, testStatObj)
 
-    if Rooibos.Common.isFunction(testSuite.afterEach)
+    if Common.isFunction(testSuite.afterEach)
       testSuite.afterEach()
     end if
 
@@ -354,7 +353,5 @@ sub Rooibos_TestRunnerMixin_RunTestCases(metaTestSuite, itGroup, testSuite, tota
   end for
 
   suiteStatObj.metaTestSuite = metaTestSuite
-  Rooibos.Stats.appendSuiteStatistic(totalStatObj, suiteStatObj)
-end sub
-
-' end namespace
\ No newline at end of file
+  Stats.appendSuiteStatistic(totalStatObj, suiteStatObj)
+end sub
\ No newline at end of file
diff --git a/src/source/UnitTestResult.bs b/src/source/UnitTestResult.bs
new file mode 100644
index 00000000..9d3536f2
--- /dev/null
+++ b/src/source/UnitTestResult.bs
@@ -0,0 +1,52 @@
+class UnitTestResult
+
+  public messages = []
+  public isFail = false
+  public currentAssertIndex = 0
+  public failedAssertIndex = 0
+  public failedMockLineNumber = -1
+
+  public function reset() as void
+    m.isFail = false
+    m.failedMockLineNumber = -1
+    m.messages = []
+  end function
+
+  public function addResult(message as string) as string
+    if (message <> "")
+      m.messages.push(message)
+      if (not m.isFail)
+        m.failedAssertIndex = m.currentAssertIndex
+      end if
+      m.isFail = true
+    end if
+    m.currentAssertIndex++
+    return message
+  end function
+
+  public function addMockResult(lineNumber, message as string) as string
+    if (message <> "")
+      m.messages.push(message)
+      if (not m.isFail)
+        m.failedMockLineNumber = lineNumber
+      end if
+      m.isFail = true
+    end if
+    return message
+  end function
+
+  public function getResult() as string
+    if (m.isFail)
+      msg = m.messages.peek()
+
+      if (msg <> invalid)
+        return msg
+      else
+        return "unknown test failure"
+      end if
+    else
+      return ""
+    end if
+  end function
+
+end class
\ No newline at end of file
diff --git a/tests/bsconfig.json b/tests/bsconfig.json
new file mode 100644
index 00000000..20cfa3b7
--- /dev/null
+++ b/tests/bsconfig.json
@@ -0,0 +1,11 @@
+{
+  "rootDir": "src",
+  "files": [
+    "manifest",
+    "source/**/*.*",
+    "components/**/*.*"
+  ],
+  "autoImportComponentScript": true,
+  "createPackage": false,
+  "stagingFolderPath": "dist"
+}
\ No newline at end of file
diff --git a/tests/bsconfigl.coverage.json b/tests/bsconfigl.coverage.json
new file mode 100644
index 00000000..1183314c
--- /dev/null
+++ b/tests/bsconfigl.coverage.json
@@ -0,0 +1,14 @@
+{
+  "rootDir": "src",
+  "files": [
+    "manifest",
+    "source/**/*.*",
+    "components/**/*.*"
+  ],
+  "autoImportComponentScript": true,
+  "createPackage": false,
+  "stagingFolderPath": "dist",
+  "rooibos-settings": {
+    "coverage": true
+  }
+}
\ No newline at end of file
diff --git a/tests/package.json b/tests/package.json
new file mode 100644
index 00000000..eea9075e
--- /dev/null
+++ b/tests/package.json
@@ -0,0 +1,39 @@
+{
+  "name": "rooibos-tests",
+  "version": "4.0.0",
+  "description": "simple, flexible, fun brightscript test framework for roku scenegraph apps - tests",
+  "directories": {
+    "doc": "docs"
+  },
+  "dependencies": {
+    "log": "npm:maestro-roku-log@^0.2.2",
+    "rooibos": "../"
+  },
+  "devDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/georgejecook/rooibos.git"
+  },
+  "keywords": [
+    "brightscript",
+    "mvvm",
+    "framework",
+    "fun"
+  ],
+  "author": "George Cook",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/georgejecook/rooibos/issues"
+  },
+  "homepage": "https://github.com/georgejecook/rooibos#readme",
+  "ts-node": {
+    "transpileOnly": true,
+    "compileOptions": {
+      "incremental": true,
+      "allowJs": false
+    }
+  },
+  "ropm": {
+    "rootDir": "src"
+  }
+}
diff --git a/tests/src/.vscode/launch.json b/tests/src/.vscode/launch.json
new file mode 100644
index 00000000..48ef965b
--- /dev/null
+++ b/tests/src/.vscode/launch.json
@@ -0,0 +1,56 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "brightscript",
+      "request": "launch",
+      "name": "Tests",
+      "stopOnEntry": false,
+      "preLaunchTask": "buildTests",
+      "envFile": "${workspaceFolder}/.vscode/.env",
+      "host": "${env:ROKU_DEV_TARGET}",
+      "password": "${env:ROKU_DEVPASSWORD}",
+      "rootDir": "${workspaceFolder}/tests/dist",
+      "sourceDirs": [
+        "${workspaceFolder}/src",
+        "${workspaceFolder}/tests/src"
+      ],
+      "files": [
+        "manifest",
+        "source/**/*.*",
+        "components/**/*.*",
+        "images/**/*.*",
+        "font/**/*.*",
+        "!*.zip",
+        "!**/*.zip"
+      ],
+    },
+    {
+      "type": "brightscript",
+      "request": "launch",
+      "name": "Tests With Coverage",
+      "stopOnEntry": false,
+      "preLaunchTask": "buildTestsWithCoverage",
+      "envFile": "${workspaceFolder}/.vscode/.env",
+      "host": "${env:ROKU_DEV_TARGET}",
+      "password": "${env:ROKU_DEVPASSWORD}",
+      "rootDir": "${workspaceFolder}/tests/dist",
+      "sourceDirs": [
+        "${workspaceFolder}/src",
+        "${workspaceFolder}/tests/src"
+      ],
+      "files": [
+        "manifest",
+        "source/**/*.*",
+        "components/**/*.*",
+        "images/**/*.*",
+        "font/**/*.*",
+        "!*.zip",
+        "!**/*.zip"
+      ],
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/src/.vscode/settings.json b/tests/src/.vscode/settings.json
new file mode 100644
index 00000000..b278f1d1
--- /dev/null
+++ b/tests/src/.vscode/settings.json
@@ -0,0 +1,38 @@
+{
+  "files.exclude": {
+    "build": true,
+    ".history": true,
+    "node_modules": true,
+    "out": true,
+    "**/.classpath": true,
+    "**/.project": true,
+    "**/.settings": true,
+    "**/.factorypath": true,
+    "/tmp/**": true,
+  },
+  "search.exclude": {
+    "**/.git/objects/**": true,
+    "**/.git/subtree-cache/**": true,
+    "**/node_modules/**": true,
+    "**/.meteor/local": true,
+    "**/build/**": true,
+    "build/**": true,
+    "**/.history/**": true,
+    ".history/**": true,
+    ".history/**/*": true,
+    "out/**": true,
+    "**/out/**": true,
+    "/tmp/**": true,
+  },
+  "files.useExperimentalFileWatcher": true,
+  "files.watcherExclude": {
+    "**/.git/objects/**": true,
+    "**/.git/subtree-cache/**": true,
+    "**/node_modules/**": true,
+    "**/.meteor/local": true,
+    "**/build/**": true,
+    "**/.history/**": true,
+    ".history/**": true,
+    "**/out/**": true,
+  },
+}
\ No newline at end of file
diff --git a/tests/src/.vscode/tasks.json b/tests/src/.vscode/tasks.json
new file mode 100644
index 00000000..e0141d80
--- /dev/null
+++ b/tests/src/.vscode/tasks.json
@@ -0,0 +1,37 @@
+{
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "buildTests",
+      "type": "shell",
+      "command": "npm run test",
+      "presentation": {
+        "echo": true,
+        "reveal": "silent",
+        "focus": false,
+        "panel": "shared",
+        "showReuseMessage": false,
+        "clear": true,
+      },
+      "group": {
+        "kind": "test",
+        "isDefault": true
+      }
+    },
+    {
+      "label": "buildTestsWithCoverage",
+      "type": "shell",
+      "command": "npm run testWithCoverage",
+      "presentation": {
+        "echo": true,
+        "reveal": "silent",
+        "focus": false,
+        "panel": "shared",
+        "showReuseMessage": false,
+        "clear": true,
+      },
+    },
+  ]
+}
\ No newline at end of file
diff --git a/tests/src/components/MainScene.bs b/tests/src/components/MainScene.bs
new file mode 100644
index 00000000..59c540d2
--- /dev/null
+++ b/tests/src/components/MainScene.bs
@@ -0,0 +1,52 @@
+import "pkg:/source/roku_modules/log/LogMixin.brs"
+
+function Init() as void
+  createObject("roSGNode", "TrackerTask")
+  m.global.addFields({"isFocusLocked": false})
+  m.top.rLog = log_initializeLog()
+  m.top.rLog.logLevel = 5
+  m.top.rLog.excludeFilters = ["TabController"]  
+  log_registerLogger("MainScene")
+  log_logInfo("init")
+end function
+  
+  ' /**
+  '  * @member begin
+  '  * @memberof module:MainScene
+  '  * @instance
+  '  * @description This would be called when all initial data is loaded. The app would show a loading spinner and loading background until this point
+  '  * @param {paramType} paramDescription
+  '  * @returns {returnType} returnDescription
+  '  */
+function begin(args = invalid)
+  log_logInfo("begin")
+  initializeIOC()
+  m.modelLocator.appArgs = args
+
+  log_logInfo("starting the bootstrap task to orchestrate our app init/loading tasks")
+  ' my apps have a task here that manages the various app initialization activities
+  ' m.bootstrapSequence = crateObject("roSGNode", "bootstrapTasks")
+  ' m.loadingSequence.observeField("isComplete", "onIsBootstrapTasksComplete")
+  ' let's just pretend it did it for now
+  onIsBootstrapTasksComplete()
+end function
+
+function onIsBootstrapTasksComplete()
+  log_logInfo("boot strap is complete - showing main screen")
+
+  m.top.appController = createObject("roSGNode", "AppController")
+  m.global.addFields({"appController": m.top.appController})
+  m.modelLocator.appController = m.top.appController
+  m.top.appendChild(m.top.appController)
+  m.top.appController@._initialize()
+  m.top.appController.setFocus(true)
+end function
+
+function initializeIOC()
+  log_logInfo("initializing the IOD container")
+  'we use a simple modelLocator for now
+  'later we'd load our IOC container here
+  m.modelLocator = createObject("roSGNode", "ModelLocator")
+  m.top._modelLocator = m.modelLocator
+  m.global.addFields({"modelLocator": m.modelLocator})
+end function
\ No newline at end of file
diff --git a/tests/src/components/MainScene.xml b/tests/src/components/MainScene.xml
new file mode 100644
index 00000000..2e5afa41
--- /dev/null
+++ b/tests/src/components/MainScene.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component name="MainScene" extends="Scene" 
+    >
+  <!-- Application's one and only scene - responsbile for loading all initial data/doing all initial tasks
+  generally, a queue of commands, which will then result in displaying the app's AppController
+  which is the screen that controls the apps main navigation and interactions
+  -->
+    <interface>
+        <!-- pointers to interesting objects -->
+        <field id="_modelLocator" type="node" />
+        <field id="rLog" type="node" />
+        <field id="AppController" type="node" />
+
+        <!-- call this when you are ready to go! -->
+        <function name="begin" />
+    </interface>
+    <children>
+
+    </children>
+</component>
diff --git a/frameworkTests/components/NodeExample.brs b/tests/src/components/NodeExample.bs
similarity index 100%
rename from frameworkTests/components/NodeExample.brs
rename to tests/src/components/NodeExample.bs
diff --git a/frameworkTests/components/NodeExample.xml b/tests/src/components/NodeExample.xml
similarity index 85%
rename from frameworkTests/components/NodeExample.xml
rename to tests/src/components/NodeExample.xml
index 81991024..94e518ba 100644
--- a/frameworkTests/components/NodeExample.xml
+++ b/tests/src/components/NodeExample.xml
@@ -10,10 +10,6 @@
 			id="state" />
 	</interface>
 
-	<script
-		type="text/brightscript"
-		uri="NodeExample.brs" />
-
 	<children>
 		<Label
 			id="nameText"
diff --git a/tests/src/components/TestsScene.bs b/tests/src/components/TestsScene.bs
new file mode 100644
index 00000000..76efc1d8
--- /dev/null
+++ b/tests/src/components/TestsScene.bs
@@ -0,0 +1,3 @@
+' import "pkg:/source/tests/rooibosFunctionMap.brs"
+import "pkg:/source/rooibos.bs"
+
diff --git a/frameworkTests/components/TestsScene.xml b/tests/src/components/TestsScene.xml
similarity index 61%
rename from frameworkTests/components/TestsScene.xml
rename to tests/src/components/TestsScene.xml
index d56b6dd9..24def683 100644
--- a/frameworkTests/components/TestsScene.xml
+++ b/tests/src/components/TestsScene.xml
@@ -2,12 +2,6 @@
 <component
     name="TestsScene"
     extends="Scene">
-  <script
-      type="text/brightscript"
-      uri="pkg:/source/tests/rooibosFunctionMap.brs" />
-  <script
-      type="text/brightscript"
-      uri="pkg:/source/tests/rooibosDist.brs" />
 
   <interface>
     <function name="Rooibos_CreateTestNode"/>
diff --git a/tests/src/components/debug/RALETrackerTask.brs b/tests/src/components/debug/RALETrackerTask.brs
new file mode 100644
index 00000000..6e691fa6
--- /dev/null
+++ b/tests/src/components/debug/RALETrackerTask.brs
@@ -0,0 +1,2691 @@
+' RALE_Config - RALE config singleton class
+' @return {object} - RALE config properties
+Function RALE_Config() as Object
+    if m.appConfig = Invalid then m.appConfig = RALE_InitConfig()
+    return m.appConfig
+End Function
+
+' RALE_InitConfig - RALE config init function. Defines all config properties
+' @return {object} - RALE config properties
+Function RALE_InitConfig() as Object
+    this = {
+        bufferSize: 100024,
+        minSocketPort: 49152,
+        maxSocketPort: 65535,
+        screensaverResetTimeout: 30000,
+        commandTimeout: 10000,
+        defaultLogLevel: 3,
+        logFormat: "[RALE][%level%] - %message%"
+    }
+
+    return this
+End Function
+
+
+' RALE_Logger - Constructor of Logger class
+' @param {integer} level - log verbosity level (0-4)
+' @param {string} format - log message format ("[MY_CUSTOM_PREFIX]%message%")
+' @return {object} - logger instance
+function RALE_Logger(level = -1 as Integer, format = "%message%" as String) as Object
+    this = {}
+
+    this.verbosityList = ["OFF", "ERROR", "WARN", "INFO", "DEBUG"]
+    this.verbosityMap = {
+        off     : 0
+        error   : 1
+        warning : 2
+        info    : 3
+        debug   : 4
+    }
+    this.formatMethods = {
+        date:    "getDate",
+        time:    "getTime",
+        level:   "getLevel",
+        message: "getMessage"
+    }
+
+    this.dt = createObject("roDateTime")
+
+    this.setVerbosity = RALE_Logger__SetVerbosityLevel
+    this.setFormat    = RALE_Logger__SetFormat
+
+    this.getDate    = RALE_Logger__GetDate
+    this.getTime    = RALE_Logger__GetTime
+    this.getLevel   = RALE_Logger__GetLevel
+    this.getMessage = RALE_Logger__GetMessage
+
+    this.debug      = RALE_Logger__DebugLog
+    this.info       = RALE_Logger__InfoLog
+    this.warning    = RALE_Logger__WarningLog
+    this.error      = RALE_Logger__ErrorLog
+    this.logMessage = RALE_Logger__LogMessage
+
+    this.setVerbosity(level)
+    this.setFormat(format)
+
+    return this
+end function
+
+' RALE_Logger__SetVerbosityLevel - change logger verbosity level
+' @param {integer} level - log verbosity level (0-4)
+sub RALE_Logger__SetVerbosityLevel(level = 4 as Integer)
+    if level > m.verbosityMap.debug then
+        m.verbosityLevel = m.verbosityMap.debug
+    else if level < m.verbosityMap.off then
+        m.verbosityLevel = m.verbosityMap.off
+    else
+        m.verbosityLevel = level
+    end if
+end sub
+
+' RALE_Logger__SetFormat - Change logger message format
+' @param {string} format - log message format ("[MY_CUSTOM_PREFIX]%message%")
+' Available format variables:
+' %message% - message with which the log function is called (at the end by default)
+' %date% - current date in format "[year]-[month]-[day]"
+' %time% -  current time in format "[hours]:[minutes]:[seconds].[miliseconds]"
+' %level% - verbosity level ("ERROR", "WARN", "INFO" or "DEBUG")
+sub RALE_Logger__SetFormat(format = "%message%" as String)
+    if Instr(1, format, "%message%") = 0 then
+        format = format + "%message%"
+    end if
+    m.formatList = format.split("%")
+end sub
+
+'==========================================
+' Wrappers over various levels of logging
+'==========================================
+
+' RALE_Logger__DebugLog - Log message into console with DEBUG verbosity level
+' @param {string} message - log message
+sub RALE_Logger__DebugLog(message = "")
+    m.logMessage(message, m.verbosityMap.debug)
+end sub
+
+' RALE_Logger__InfoLog - Log message into console with INFO verbosity level
+' @param {string} message - log message
+sub RALE_Logger__InfoLog(message = "")
+    m.logMessage(message, m.verbosityMap.info)
+end sub
+
+' RALE_Logger__WarningLog - Log message into console with WARNING verbosity level
+' @param {string} message - log message
+sub RALE_Logger__WarningLog(message = "")
+    m.logMessage(message, m.verbosityMap.warning)
+end sub
+
+' RALE_Logger__ErrorLog - Log message into console with ERROR verbosity level
+' @param {string} message - log message
+sub RALE_Logger__ErrorLog(message)
+    m.logMessage(message, m.verbosityMap.error)
+end sub
+
+'==========================================
+' Main log function
+'==========================================
+
+' RALE_Logger__LogMessage - Log message into console by message format if logLevel is more than current verbosityLevel
+' @param {string} message - log message
+' @param {integer} logLevel - log verbosity level (0-4)
+sub RALE_Logger__LogMessage(message as String, logLevel as Integer)
+    if  logLevel > 0 and m.verbosityLevel >= logLevel then
+        logMessage = ""
+
+        for each item in m.formatList
+            formatMethod = m.formatMethods[item]
+
+            if formatMethod = Invalid then
+                logMessage = logMessage + item
+            else
+                logMessage = logMessage + m[formatMethod](message, logLevel)
+            end If
+        end for
+
+        print logMessage
+    end if
+end sub
+
+'==========================================
+' Utitlity functions
+'==========================================
+
+' RALE_Logger__GetTime - Returns current time
+' @param {string} message - log message
+' @return {string} - current time in format: "[hours]:[minutes]:[seconds].[miliseconds]"
+function RALE_Logger__GetTime(message as String, level as Integer)
+    m.dt.Mark()
+
+    h = RALE_Logger__getZeroNumber(m.dt.getHours())
+    n = RALE_Logger__getZeroNumber(m.dt.getMinutes())
+    s = RALE_Logger__getZeroNumber(m.dt.getSeconds())
+    ms = str(m.dt.getMilliseconds()).trim()
+    if len(ms) = 1
+      ms = ms + "0"
+    else
+      ms = left(ms, 2)
+    end if
+    return h + ":" + n + ":" + s + "." + ms
+end function
+
+' RALE_Logger__GetDate - Returns current date
+' @param {string} message - log message
+' @return {string} - current date in format: "[year]-[month]-[day]"
+function RALE_Logger__GetDate(message as String, level as Integer)
+    m.dt.Mark()
+    y = str(m.dt.getYear()).trim()
+    mm = RALE_Logger__getZeroNumber(m.dt.getMonth())
+    d = RALE_Logger__getZeroNumber(m.dt.getDayOfMonth())
+    return y + "-" + mm + "-" + d
+end function
+
+' RALE_Logger__GetLevel - Returns current verbosity level
+' @param {string} message - log message
+' @return {integer} - verbosity level
+function RALE_Logger__GetLevel(message as String,  level as Integer)
+    return m.verbosityList[level]
+end function
+
+' RALE_Logger__GetMessage - Returns log message (needed for formating log message)
+' @param {string} message - log message
+' @return {string} - log message
+function RALE_Logger__GetMessage(message as String, level as Integer)
+    return message
+end function
+
+' RALE_Logger__getZeroNumber - Convert number to format "0[number]" if it has less then 2 digits
+' @param {number} n - number for converting
+' @param {number} to_length -  the necessary count of digits
+' @return {string} - converted number format
+function RALE_Logger__getZeroNumber(n, to_length=2)
+    n = str(n).trim()
+    if len(n) < to_length
+        n = String(to_length - 1, "0") + n
+    end if
+    return n
+end function
+
+
+' CreateRedLines - Selector (live) view class constructor
+' @return {object} - selector (live) view
+Function CreateRedLines() as Object
+    this = {}
+    node = CreateObject("roSGNode", "Group")
+    node.addFields({"isExternallyExposed": true})
+    this.node = node
+    this.childMap = {}
+
+    this.setLine = RedLines_SetLine
+    this.setRulerLines = RedLines_SetRulerLines
+    this.removeLine = RedLines_RemoveLine
+    this.removeAllLines = RedLines_RemoveAllLines
+
+    this.resolution = m.top.getScene().getField("currentDesignResolution")
+
+    return this
+End Function
+
+Sub RedLines_SetLine(id, position, coords)
+    if (m.childMap[id] = invalid) then
+        RedLines_AddLine(id, position, coords, m.node, m.childMap)
+    else
+        RedLines_UpdatePosition(id, coords, m.childMap)
+    end if
+end Sub
+
+Sub RedLines_SetRulerLines(rulerLines)
+    For Each line In rulerLines.Items()
+        RedLines_AddLine(line.key, line.value.position, line.value.coords, m.node, m.childMap)
+    End For
+end Sub
+
+Sub RedLines_AddLine(id, position, coords, node, childMap) as Object
+    line = CreateObject("roSGNode", "Rectangle")
+    line.setField("id", id)
+    line.setField("color", "#00F8FF")
+    line.addFields({"position": position})
+    RedLines_SetLineCoords(line, coords)
+    node.appendChild(line)
+    childMap[id] = line
+end Sub
+
+Sub RedLines_UpdatePosition(id, coords, childMap) as Object
+    line = childMap[id]
+    RedLines_SetLineCoords(line, coords)
+end Sub
+
+Sub RedLines_SetLineCoords(node, coords) as Integer
+    if node.position = "horizontal" then
+            node.setField("translation", [coords.x,0])
+            node.setField("width", 1)
+            node.setField("height", m.resolution.height)
+        end if
+        if node.position = "vertical" then
+            node.setField("translation", [0,coords.y])
+            node.setField("width", m.resolution.width)
+            node.setField("height", 1)
+        end if
+end Sub
+
+Sub RedLines_RemoveLine(id)
+    line = m.childMap[id]
+    m.node.removeChild(line)
+    m.childMap[id] = invalid
+end Sub
+
+Sub RedLines_RemoveAllLines()
+    childrenList = m.node.getChildren(-1,0)
+    m.node.removeChildren(childrenList)
+    m.childMap = {}
+end Sub
+
+
+' CreateSelectorView - Selector (live) view class constructor
+' @return {object} - selector (live) view
+Function CreateSelectorView() as Object
+    view = CreateObject("roSGNode", "Group")
+
+    m.resolution = m.top.getScene().getField("currentDesignResolution")
+    m.resWidth = m.resolution.width
+    m.resHeight = m.resolution.height
+
+    children = [
+        {subtype : "Rectangle", fields : {id : "l"}}
+        {subtype : "Rectangle", fields : {id : "r"}}
+        {subtype : "Rectangle", fields : {id : "b"}}
+        {subtype : "Rectangle", fields : {id : "t"}}
+
+        {subtype : "Rectangle", fields : {id : "horiz"}}
+        {subtype : "Rectangle", fields : {id : "vert"}}
+
+
+        {subtype : "Rectangle", fields : {id : "leftLine"}}
+        {subtype : "Rectangle", fields : {id : "topLine"}}
+        {subtype : "Rectangle", fields : {id : "rightLine"}}
+        {subtype : "Rectangle", fields : {id : "bottomLine"}}
+
+        {subtype : "Label", fields : {id : "leftCords"}}
+        {subtype : "Label", fields : {id : "topCords"}}
+        {subtype : "Label", fields : {id : "rightCords"}}
+        {subtype : "Label", fields : {id : "bottomCords"}}
+
+        {subtype : "Rectangle", fields : {id : "fill", color :  "#ffffff44"}}
+        {subtype : "Timer",     fields : {id : "timer", duration : 1 / 60, repeat : true}}
+    ]
+
+    viewObject = NodeUtils_AddChildrenToNode(view, children)
+    childrenMap = {}
+    for each child in viewObject.children
+        node = child.node
+        childrenMap[node.id] = node
+    end for
+
+    interface = [
+        {id:"width", type:"float", value : "1280", onChange : "SelectorView_UpdateView"}
+        {id:"height", type:"float", value : "40", onChange : "SelectorView_UpdateView"}
+        {id:"border", type:"float", value : "2", onChange : "SelectorView_UpdateView"}
+        {id:"oldBoundingRect", type:"assocarray" }
+        {id:"boundingRect", type:"assocarray", onChange : "SelectorView_UpdateViewFromBRect"}
+        {id:"color", type:"color", value : "#FFFFFF", onChange : "SelectorView_UpdateColors"}
+        {id:"attachedView", type:"node", onChange : "SelectorView_AttachToView"}
+        {id:"isExternallyExposed", type:"boolean", value : "true"}
+        {id:"childrenMap", type:"assocarray", value : childrenMap}
+    ]
+    NodeUtils_AddInterfaceToNode(view, interface)
+
+    timer = view.childrenMap.timer
+    timer.observeField("fire","SelectorView_UpdateViewPosition")
+    timer.control = "start"
+
+    return view
+End Function
+
+' NodeUtils_AddInterfaceToNode - Adds interface to node
+' @param {object} node - node
+' @param {object} interface - interface
+' @return {boolean} - is interface was added
+Function NodeUtils_AddInterfaceToNode(node, interface as Object) as Boolean
+    if node = invalid OR interface = invalid then return false
+    for each field in interface
+        NodeUtils_AddNodeInterfaceField(node, field)
+    end for
+    return true
+End Function
+
+' NodeUtils_AddNodeInterfaceField - Adds interface field to node
+' @param {object} node - node
+' @param {object} fieldConfig - field config
+' @return {boolean} - is interface was added
+Function NodeUtils_AddNodeInterfaceField(node, fieldConfig as Object) as Boolean
+    if node = invalid OR fieldConfig = invalid then return false
+    if fieldConfig.id = invalid then return false
+    if fieldConfig.type = invalid then return false
+
+    if fieldConfig.alwaysNotify = invalid then fieldConfig.alwaysNotify = true
+
+    if node.hasField(fieldConfig.id) then return false
+
+    node.addField(fieldConfig.id, fieldConfig.type, fieldConfig.alwaysNotify)
+
+    if not node.hasField(fieldConfig.id) then return false
+
+    if fieldConfig.value <> invalid then
+        node[fieldConfig.id] = fieldConfig.value
+    end if
+
+    if fieldConfig.onChange <> invalid then
+        node.observeField(fieldConfig.id, fieldConfig.onChange)
+    end if
+
+    return true
+End Function
+
+' NodeUtils_AddChildrenToNode - Adds children to node
+' @param {object} node - node
+' @param {object} childrenConfig - children config
+' @return {object} - view object
+Function NodeUtils_AddChildrenToNode(node, childrenConfig as Object) as Object
+    if node = invalid then return invalid
+    viewObject = {node : node, children : []}
+    if childrenConfig <> invalid then
+        for each childConfig in childrenConfig
+            childObject = NodeUtils_AddChildToNode(node, childConfig)
+            viewObject.children.push(childObject)
+        end for
+    end if
+
+    return viewObject
+End Function
+
+' NodeUtils_AddChildToNode - Adds child to node
+' @param {object} node - node
+' @param {object} childConfig - child config
+' @return {object} - view object
+Function NodeUtils_AddChildToNode(node, childConfig) as Object
+    if node = invalid or childConfig = invalid then return invalid
+    if childConfig.subtype = invalid then return invalid
+    view = node.CreateChild(childConfig.subtype)
+    if view = invalid then return invalid
+    if childConfig.fields <> invalid then view.setFields(childConfig.fields)
+    return NodeUtils_AddChildrenToNode(view, childConfig.children)
+End Function
+
+' NumberToFixed - formats a number using fixed-point notation
+' @param {float, double} number - formated number
+' @param {integer} digits - the number of digits to appear after the decimal point
+' @return {string} - a string representing the given number using fixed-point notation
+Function NumberToFixed(number, digits) as String
+    str = number.toStr()
+    arr = str.split(".")
+
+    if arr.count() > 1 and digits > 0 then
+        return arr[0] + "." + Left(arr[1], digits)
+    end if
+
+    return arr[0]
+End Function
+
+' SelectorView_UpdateView - width, height and border change event handler. Updates Selector (live) view
+' @param {object} event - event data
+Sub SelectorView_UpdateView(event)
+    node = event.getRoSGNode()
+    border = node.border
+    width  = node.width
+    height = node.height
+    x = node.boundingRect.x
+    y = node.boundingRect.y
+    rightPos = x + width + border*2
+    bottomPos = y + height + border*2
+
+    l = node.childrenMap.l
+    l.width = border
+    l.height = height + border*2
+    l.translation = [-border, -border]
+
+    r = node.childrenMap.r
+    r.width = border
+    r.height = height + border*2
+    r.translation = [width, -border]
+
+    t = node.childrenMap.t
+    t.width = width + border*2
+    t.height = border
+    t.translation = [-border, -border]
+
+    b = node.childrenMap.b
+    b.width = width + border*2
+    b.height = border
+    b.translation = [-border, height]
+
+    horiz = node.childrenMap.horiz
+    horiz.width = width
+    horiz.height = border
+    horiz.translation = [0, (height - border) / 2]
+
+    vert = node.childrenMap.vert
+    vert.width = border
+    vert.height = height
+    vert.translation = [(width - border) / 2, 0]
+
+    leftLine = node.childrenMap.leftLine
+    leftLine.width = x
+    leftLine.height = border
+    leftLine.translation = [-x, (height - border) / 2]
+
+    topLine = node.childrenMap.topLine
+    topLine.width = border
+    topLine.height = y
+    topLine.translation = [(width - border) / 2, -y]
+
+    rightLine = node.childrenMap.rightLine
+    rightLine.width = m.resWidth - x + 10
+    rightLine.height = border
+    rightLine.translation = [width + border, (height - border) / 2]
+
+    bottomLine = node.childrenMap.bottomLine
+    bottomLine.width = border
+    bottomLine.height = m.resHeight - y + 10
+    bottomLine.translation = [(width - border) / 2, height + border]
+
+    leftCords = node.childrenMap.leftCords
+    leftCords.font.size = 20
+    leftCords.color = "#FF0000"
+    leftCords.text = NumberToFixed(x, 0)
+    leftCords.translation = [-x/2 - 10, (height - border) / 2 - 20]
+
+    topCords = node.childrenMap.topCords
+    topCords.font.size = 20
+    topCords.color = "#FF0000"
+    topCords.text = NumberToFixed(y, 0)
+    topCords.translation = [(width - border) / 2 + 10, -y/2 - 10]
+
+    rightCords = node.childrenMap.rightCords
+    rightCords.font.size = 20
+    rightCords.color = "#FF0000"
+    rightCords.text = NumberToFixed(m.resWidth - x - width, 0)
+    rightCords.translation = [width + (m.resWidth - rightPos)/2 - 5, (height - border) / 2 - 20]
+
+    bottomCords = node.childrenMap.bottomCords
+    bottomCords.font.size = 20
+    bottomCords.color = "#FF0000"
+    bottomCords.text = NumberToFixed(m.resHeight - y - height, 0)
+    bottomCords.translation = [(width - border) / 2 + 10, height + (m.resHeight - bottomPos)/2 - 5]
+
+    fill = node.childrenMap.fill
+    fill.width = width
+    fill.height = height
+End Sub
+
+' SelectorView_UpdateColors - color change event handler. Updates Selector (live) view color
+' @param {object} event - event data
+Sub SelectorView_UpdateColors(event)
+    node = event.getRoSGNode()
+    for each view in node.getchildren(-1,0)
+        if view.isSubtype("Rectangle") and view.id <> "fill" then view.color = node.color
+    end for
+End Sub
+
+' SelectorView_UpdateViewFromBRect - boundingRect change event handler.
+'                             Updates Selector (live) view translation, width and height
+' @param {object} event - event data
+Sub SelectorView_UpdateViewFromBRect(event)
+    node = event.getRoSGNode()
+    boundingRect = node.boundingRect
+    if boundingRect <> Invalid then
+        node.setFields({
+            translation : [boundingRect.x, boundingRect.y]
+            width : boundingRect.width
+            height : boundingRect.height
+        })
+    end if
+End Sub
+
+' isBoundingRectChanged - checks is bounding rect was changed
+' @param {object} br - node bounding rect
+' @param {object} node - node
+' @return {boolean} - true if node bounding rect was changed
+Sub isBoundingRectChanged(br, node) as Boolean
+    o = node.oldBoundingRect
+    if o = Invalid then
+        node.oldBoundingRect = br
+        return true
+    end if
+    if o.x = br.x and o.y = br.y and o.width = br.width and o.height = br.height  then
+        return false
+    else
+        node.oldBoundingRect = br
+        return true
+    end if
+End Sub
+
+' SelectorView_UpdateViewPosition - interval event handler. Updates selector (live) view position
+' @param {object} event - node bounding rect
+Sub SelectorView_UpdateViewPosition(event)
+    timer = event.getRoSGNode()
+    node = timer.getparent()
+
+    if node.attachedView <> Invalid then
+        boundingRect = node.attachedView.sceneboundingRect()
+    else
+        boundingRect = {x: -100, y: -100, width: 0, height: 0}
+    end if
+
+    if isBoundingRectChanged(boundingRect, node) then
+        node.boundingRect = boundingRect
+    end if
+End Sub
+
+
+' getCommandMap - Defines map that contains all RALE commands handlers
+' @return {object} - handlers map
+Sub getCommandMap() as Object
+    return {
+        "init" : "UIThread_init",
+
+        ' Config commands
+        "showSelectorView" : "UIThread_showSelectorView",
+        "hideSelectorView" : "UIThread_hideSelectorView",
+
+        ' Node commands
+        "selectNode" : "UIThread_selectNode",
+        "updateNode" : "UIThread_updateNode",
+        "getNodeData" : "UIThread_getNodeData",
+
+        ' Tree View commands
+        "getItemList" : "UIThread_getItemList",
+        "getNodeTree" : "UIThread_getNodeTree",
+        "getNodeById" : "UIThread_getNodeById",
+        "getNodeByName" : "UIThread_getNodeByName",
+
+        ' Children commands
+        "addChild" : "UIThread_addChild",
+        "removeChild" : "UIThread_removeChild",
+        "moveChild" : "UIThread_moveChild",
+
+        ' Field commands
+        "setField" : "UIThread_setField",
+        "removeField" : "UIThread_removeField",
+
+        ' Focus commands
+        "setFocus" : "UIThread_setFocus",
+        "selectFocusedNode" : "UIThread_selectFocusedNode",
+
+        ' Bounding Rect commands
+        "setBoundingRect" : "UIThread_setBoundingRect",
+
+        ' Registry commands
+        "getRegistrySections"   : "UIThread_getRegistrySections",
+        "clearRegistry"         : "UIThread_clearRegistry",
+        "addRegistrySection"    : "UIThread_addRegistrySection",
+        "removeRegistrySection" : "UIThread_removeRegistrySection",
+        "addRegistryField"      : "UIThread_addRegistryField",
+        "removeRegistryField"   : "UIThread_removeRegistryField",
+        "editRegistryField"     : "UIThread_editRegistryField",
+
+        ' Logger commands
+        "setLogVerbosity" : "UIThread_setLogVerbosity",
+        "setLogFormat"    : "UIThread_setLogFormat",
+        "log"             : "UIThread_log"
+
+        ' Ruler lines commands
+        "setRulerLine"             : "UIThread_setRulerLine",
+        "setRulerLines"            : "UIThread_setRulerLines",
+        "removeRulerLine"          : "UIThread_removeRulerLine",
+        "removeAllRulerLines"      : "UIThread_removeAllRulerLines",
+    }
+End Sub
+
+' callCommand - Call RALE command functuin from UI thread
+' @param {string} command - command name
+' @param {object} args - command arguments
+' @return {object} - response of RALE command
+Sub callCommand(command, args) as Object
+    return m.top.callFunc(command, args)
+End Sub
+
+' UIThread_init - RALE "init" command
+' @param {object} args - command arguments
+' @return {object} - response of command. Contains RALE version and session id
+Sub UIThread_init(args) as Object
+    root = m.top.GetScene()
+
+    m.currentNode  = root
+    m.currentPath  = []
+
+    if m.selectorView = Invalid then
+        m.selectorView = CreateSelectorView()
+        m.selectorView.color = "#ff0000"
+        m.selectorView.opacity = 0.6
+        m.showSelectorView = true
+        root.appendChild(m.selectorView)
+    end if
+
+    if m.redLines = Invalid then
+        m.redLines = CreateRedLines()
+        root.appendChild(m.redLines.node)
+    else
+        UIThread_removeAllRulerLines({})
+    end if
+
+    if args.logVerbosity >= 0 then
+        UIThread_setLogVerbosity({ level: args.logVerbosity })
+    end if
+
+    if FW_IsString(args.logFormat) then
+        UIThread_setLogFormat({ format: args.logFormat })
+    end if
+
+    m.logger.info("RALE Initialized")
+    return { raleVersion: m.raleVersion, sessionid: m.sessionId }
+End Sub
+
+'=======================
+' Config commands
+'=======================
+
+' UIThread_showSelectorView - RALE "showSelectorView" command handler. Shows Selector (Live) View
+' @param {object} args - command arguments
+Sub UIThread_showSelectorView(args) as Object
+    m.showSelectorView = true
+    setSelectorView(m.currentNode, type(m.currentNode), m.currentPath)
+    m.logger.debug("Selector View was disabled")
+End Sub
+
+' UIThread_hideSelectorView - RALE "hideSelectorView" command handler. Hides Selector (Live) View
+' @param {object} args - command arguments
+Sub UIThread_hideSelectorView(args) as Object
+    m.showSelectorView = false
+    setSelectorView(m.currentNode, type(m.currentNode), m.currentPath)
+    m.logger.debug("Selector View was enabled")
+End Sub
+
+'=======================
+' Node commands
+'=======================
+
+' UIThread_selectNode - RALE "selectNode" command handler. Selects node by path
+' @param {object} args - command arguments
+' @return {object} - response of command. Contains node path and node data (id, type, fields, layout etc.)
+Sub UIThread_selectNode(args) as Object
+    path = args["path"]
+
+    root = m.top.getScene()
+    node = RALE_getNodeByPath(root, path)
+    if node = Invalid then return getError("Invalid Path")
+
+    nodeType = type(node)
+
+    if nodeType <> "roSGNode" and nodeType = "roArray" and nodeType = "roAssociativeArray" then
+        return getError("Invalid Node Type")
+    end if
+
+    if nodeType = "roSGNode" and node.isExternallyExposed <> Invalid then
+        return getError("Node Is Externally Exposed")
+    end if
+
+    if nodeType <> "roSGNode" or not node.IsSameNode(m.currentNode) then
+        m.currentPath = path
+        m.currentNode = node
+    end if
+
+    setSelectorView(node, nodeType, path)
+
+    m.logger.debug("Node selected: " + FW_AsString(m.currentNode))
+    return {
+        path: m.currentPath,
+        node: getNodeData(m.currentNode, m.currentPath, root)
+    }
+End Sub
+
+' UIThread_updateNode - RALE "updateNode" command handler. Updates selected node
+' @param {object} args - command arguments
+' @return {object} - response of command. Contains node path and data (id, type, fields, layout etc.)
+Sub UIThread_updateNode(args) as Object
+    return {
+        path: m.currentPath,
+        node: getNodeData(m.currentNode, m.currentPath, Invalid)
+    }
+End Sub
+
+' UIThread_getNodeData - RALE "getNodeData" command handler. Returns selected node data
+' @param {object} args - command arguments
+' @return {object} - response of command. Node data (id, type, fields, layout etc.)
+Sub UIThread_getNodeData(args) as Object
+    path = args["path"]
+
+    if path = Invalid then
+        path = m.currentPath
+        node = m.currentNode
+    else
+        root = m.top.getScene()
+        node = RALE_getNodeByPath(root, path)
+        if node = Invalid then return getError("Invalid Path")
+    end if
+
+    return getNodeData(node, path, Invalid)
+End Sub
+
+'=======================
+' Tree View commands
+'=======================
+
+' UIThread_getItemList - RALE "getItemList" command handler. Returns node children and fields, by node path
+' @param {object} args - command arguments
+' @return {object} - response of command. List of node children and fields
+Sub UIThread_getItemList(args) as Object
+    path = args["path"]
+
+    root = m.top.getScene()
+    node = RALE_getNodeByPath(root, path)
+    if node = Invalid then return getError("Invalid Path")
+
+    return getItemList(node, path)
+End Sub
+
+' UIThread_getNodeTree - RALE "getNodeTree" command handler. Returns children hierarchy by node path
+' @param {object} args - command arguments
+' @return {object} - response of command. Node children hierarchy
+Sub UIThread_getNodeTree(args) as Object
+    path = args["path"]
+    maxLevel = args["maxLevel"]
+
+    root = m.top.getScene()
+    node = RALE_getNodeByPath(root, path)
+    index = RALE_getNodeIndexByPath(path)
+    if node = Invalid then return getError("Invalid Path")
+
+    return getNodeTree(node, index, maxLevel)
+End Sub
+
+' UIThread_getNodeById - RALE "getNodeById" command handler. Returns node with requested id
+' @param {object} args - command arguments
+' @return {object} - response of command. Found node data
+Sub UIThread_getNodeById(args) as Object
+    path = args["path"]
+    id = args["id"]
+
+    if id = Invalid then return getError("id is required")
+
+    root = m.top.getScene()
+    rootNode = RALE_getNodeByPath(root, path)
+    if rootNode = Invalid then return getError("Invalid Path")
+
+    foundNode = getNodeById(rootNode, id)
+    foundPath = RALE_getNodePath(foundNode, root)
+
+    return getNodeData(foundNode, foundPath, root)
+End Sub
+
+' UIThread_getNodeByName - RALE "getNodeByName" command handler. Returns node with requested name
+' @param {object} args - command arguments
+' @return {object} - response of command. Found node path
+Sub UIThread_getNodeByName(args) as Object
+    path = args["path"]
+    name = args["name"]
+
+    if name = Invalid then return getError("name is required")
+
+    root = m.top.getScene()
+    rootNode = RALE_getNodeByPath(root, path)
+    if rootNode = Invalid then return getError("Invalid Path")
+
+    foundNode = getNodeByName(rootNode, name)
+    foundPath = RALE_getNodePath(foundNode, root)
+
+    return getNodeData(foundNode, foundPath, root)
+End Sub
+
+'=======================
+' Children commands
+'=======================
+
+' UIThread_addChild - RALE "addChild" command handler. Adds new child to node by path (if no path adds to selected node)
+' @param {object} args - command arguments
+' @return {object} - response of command. Contains node children hierarchy and index
+Sub UIThread_addChild(args) as Object
+    childType = args["type"]
+    path = args["path"]
+
+    if not FW_IsString(childType) then return getError("childType is required")
+
+    index = FW_AsInteger(args["index"])
+    if index = 0 AND FW_AsString(args["index"]) <> "0" then index = Invalid
+
+    if path <> Invalid then
+        root = m.top.getScene()
+        node = RALE_getNodeByPath(root, path)
+        if node = Invalid then return getError("Invalid Path")
+    else
+        node = m.currentNode
+        path = m.currentPath
+    end if
+
+    result = addChild(node, childType, index)
+    if result.success = true then
+        index = RALE_getNodeIndexByPath(path)
+        setNodeField(result.child, "rale_new_child", true, "boolean")
+        return {
+            tree: getNodeTree(result.child, index, 50),
+            childindex: result.index
+        }
+    else
+        return result
+    end if
+End Sub
+
+' UIThread_removeChild - RALE "removeChild" command handler. Removes child from node by path (if no path removes from selected node)
+' @param {object} args - command arguments
+' @return {object} - response of command
+Sub UIThread_removeChild(args) as Object
+    index = FW_AsInteger(args["index"])
+    path = args["path"]
+
+    if index = 0 AND FW_AsString(args["index"]) <> "0" then return getError("index is required")
+
+    if path <> Invalid then
+        root = m.top.getScene()
+        node = RALE_getNodeByPath(root, path)
+        if node = Invalid then return getError("Invalid Path")
+    else
+        node = m.currentNode
+        path = m.currentPath
+    end if
+
+    return removeChild(node, index)
+End Sub
+
+' UIThread_moveChild - RALE "moveChild" command handler. Moves selected node child
+' @param {object} args - command arguments
+' @return {object} - response of command
+Sub UIThread_moveChild(args) as Object
+    fromIndex = FW_AsString(args["fromIndex"])
+    fromIndexInt = FW_AsInteger(fromIndex)
+    if fromIndexInt = 0 AND fromIndex <> "0" then return getError("fromIndex is required")
+
+    toIndex = FW_AsString(args["toIndex"])
+    toIndexInt = FW_AsInteger(toIndex)
+    if toIndexInt = 0 AND toIndex <> "0" then return getError("toIndex is required")
+
+    return moveChild(m.currentNode, fromIndexInt, toIndexInt)
+End Sub
+
+'=======================
+' Fields commands
+'=======================
+
+' UIThread_setField - RALE "setField" command handler. Sets new value into node field (if the field doesn't exist creates it)
+' @param {object} args - command arguments
+' @return {array} - response of command. Node field list
+Sub UIThread_setField(args) as Object
+    field = FW_AsString(args["field"])
+    fieldType = args["type"]
+    fieldValue = args["value"]
+
+    if field = "" then return getError("Field ID is required")
+    if RALE_convertToType(fieldValue, FW_AsString(fieldType)) = Invalid then return getError("Invalid Field Type or Value")
+
+    path = m.currentPath
+    nodeType = type(m.currentNode)
+
+    if nodeType = "roSGNode" then
+        setNodeField(m.currentNode, field, fieldValue, fieldType)
+    else
+        m.currentNode = setObjField(path, field, fieldValue, fieldType)
+    end if
+
+    m.logger.debug("Field '" + field + "' of selected node was set to " + FW_AsString(fieldValue))
+    return getFieldList(m.currentNode)
+End Sub
+
+' UIThread_removeField - RALE "removeField" command handler. Remove field from node by id
+' @param {object} args - command arguments
+' @return {array} - response of command. Node field list
+Sub UIThread_removeField(args) as Object
+    field = args["field"]
+    if field = Invalid then return getError("Field ID is required")
+
+    node = m.currentNode
+    nodeType = type(node)
+
+    if nodeType = "roSGNode" then
+       ? ">>>>>>>>>>>>>>>>>>>>>>>"
+        ? formatJson(node[field])
+        ? ">>>>>>>>>>>>>>>>>>>>>>>"
+    else if nodeType = "roAssociativeArray" or nodeType = "roArray" then
+      if nodeType = "roArray" then field = FW_AsInteger(field)
+        ? ">>>>>>>>>>>>>>>>>>>>>>>"
+        ? formatJson(node[field])
+        ? ">>>>>>>>>>>>>>>>>>>>>>>"
+    end if
+    return getFieldList(node)
+End Sub
+
+'=======================
+' Focus commands
+'=======================
+
+' UIThread_setFocus - RALE "setFocus" command handler. Sets focus in node by path
+' @param {object} args - command arguments
+' @return {object} - response of command. Status
+Sub UIThread_setFocus(args) as Object
+    path = args["path"]
+
+    node = m.top.getScene()
+    node = RALE_getNodeByPath(node, path)
+    if node = Invalid then return getError("Invalid Path")
+
+    m.logger.debug(FW_AsString(node) + " was focused")
+    node.setFocus(true)
+    return { success: true }
+End Sub
+
+' UIThread_selectFocusedNode - RALE "selectFocusedNode" command handler. Select focused node
+' @param {object} args - command arguments
+' @return {object} - response of command. Contains node path and data (id, type, fields, layout etc.)
+Sub UIThread_selectFocusedNode(args) as Object
+    root = m.top.getScene()
+    node = getFocusedNodeObj(root)
+    if m.currentNode.IsSameNode(node) then
+        return {
+            path: m.currentPath,
+            node: getNodeData(node, m.currentPath, root)
+        }
+    else
+        path = RALE_getNodePath(node, root)
+        m.currentNode = node
+        m.currentPath = path
+        setSelectorView(node, type(node), path)
+        m.logger.debug("Node selected: " + FW_AsString(node))
+        return {
+            path: path,
+            node: getNodeData(node, path, root)
+        }
+    end if
+End Sub
+
+'=======================
+' Bounding Rect commands
+'=======================
+
+' UIThread_setBoundingRect - RALE "setBoundingRect" command handler. Sets properties into selected node layout
+' @param {object} args - command arguments
+' @return {object} - response of command. Node sceneBoundingRect
+Sub UIThread_setBoundingRect(args) as Object
+    boundingRect = args["boundingrect"]
+    if boundingRect = Invalid then return getError("boundingrect is required")
+
+    node = m.currentNode
+    if type(node) <> "roSGNode" then return getError("Invalid Node Type")
+    currentBoundingRect = node.sceneBoundingRect()
+
+    if currentBoundingRect <> Invalid then
+        deltaX = 0
+        deltaY = 0
+        deltaWidth = 0
+        deltaHeight = 0
+
+        if boundingRect.x <> Invalid and boundingRect.y <> Invalid then
+            deltaX = currentBoundingRect.x - boundingRect.x
+            deltaY = currentBoundingRect.y - boundingRect.y
+        end if
+
+        if boundingRect.width <> Invalid and boundingRect.height <> Invalid then
+            deltaWidth = currentBoundingRect.width - boundingRect.width
+            deltaHeight = currentBoundingRect.height - boundingRect.height
+        end if
+
+        fields = {}
+
+        if node.hasField("translation") AND (deltaY <> 0 or deltaX <> 0) then
+            fields.translation = [node.translation[0] - deltaX, node.translation[1] - deltaY]
+            m.logger.debug("Selected node translation was set to " + FW_AsString(fields.translation))
+        end if
+
+        if node.hasField("width") AND deltaWidth <> 0 then
+            if node.width = 0 AND deltaWidth > 0 then
+                fields.width = boundingRect.width
+            else
+                fields.width = node.width - deltaWidth
+            end if
+            m.logger.debug("Selected node width was set to " + FW_AsString(fields.width))
+        end if
+
+        if node.hasField("height") AND deltaHeight <> 0 then
+            if node.height = 0 AND deltaHeight > 0 then
+                fields.height = boundingRect.height
+            else
+                fields.height = node.height - deltaHeight
+            end if
+            m.logger.debug("Selected node height was set to " + FW_AsString(fields.height))
+        end if
+
+        node.setFields(fields)
+    end if
+    return node.sceneBoundingRect()
+End Sub
+
+'=======================
+' Layout ruler commands
+'=======================
+' UIThread_setRulerLine - TBD
+Sub UIThread_setRulerLine(args) as Object
+    m.redLines.setLine(FW_AsString(args.id), args.position, args.coords)
+    return { success: true }
+End Sub
+
+' UIThread_setRulerLines - TBD
+Sub UIThread_setRulerLines(args) as Object
+    if args.rulerLines.Count() >= 0 then
+        m.redLines.setRulerLines(args.rulerLines)
+    end if
+    return { success: true }
+End Sub
+
+' UIThread_removeRulerLine - TBD
+Sub UIThread_removeRulerLine(args) as Object
+    m.redLines.removeLine(FW_AsString(args.id))
+    return { success: true }
+End Sub
+
+' UIThread_removeRulerLine - TBD
+Sub UIThread_removeAllRulerLines(args) as Object
+    m.redLines.removeAllLines()
+    return { success: true }
+End Sub
+
+'=======================
+' Registry commands
+'=======================
+
+' UIThread_getRegistrySections - TBD
+Sub UIThread_getRegistrySections(args) as Object
+    return getRegistrySections()
+End Sub
+
+' UIThread_addRegistrySection - TBD
+Sub UIThread_clearRegistry(args) as Object
+    return clearRegistry()
+End Sub
+
+' UIThread_addRegistrySection - TBD
+Sub UIThread_addRegistrySection(args) as Object
+    name = args.name
+    section = args.section
+
+    if not FW_IsString(name) or name = "" then return getError("Invalid name")
+    if not FW_IsAssociativeArray(section) then return getError("Invalid section. Expected an object")
+
+    return addRegistrySection(name, section)
+End Sub
+
+' UIThread_removeRegistrySection - TBD
+Sub UIThread_removeRegistrySection(args) as Object
+    name = args.name
+
+    if not FW_IsString(name) or name = "" then return getError("Invalid name")
+
+    return removeRegistrySection(name)
+End Sub
+
+' UIThread_addRegistryField - TBD
+Sub UIThread_addRegistryField(args) as Object
+    sectionName = args.sectionName
+    key = args.key
+    value = args.value
+
+    if not FW_IsString(sectionName) or sectionName = "" then return getError("Invalid section name")
+    if not FW_IsString(key) or key = "" then return getError("Invalid key")
+    if not FW_IsString(value) then return getError("Invalid value")
+
+    return addRegistryField(sectionName, key, value)
+End Sub
+
+' UIThread_removeRegistryField - TBD
+Sub UIThread_removeRegistryField(args) as Object
+    sectionName = args.sectionName
+    key = args.key
+
+    if not FW_IsString(sectionName) or sectionName = "" then return getError("Invalid section name")
+    if not FW_IsString(key) or key = "" then return getError("Invalid key")
+
+    return removeRegistryField(sectionName, key)
+End Sub
+
+' UIThread_editRegistryField - TBD
+Sub UIThread_editRegistryField(args) as Object
+    sectionName = args.sectionName
+    key = args.key
+    newKey = args.newKey
+    newValue = args.newValue
+
+    if not FW_IsString(sectionName) or sectionName = "" then return getError("Invalid section name")
+    if not FW_IsString(key) or key = "" then return getError("Invalid key")
+    if not FW_IsString(newKey) or newKey = "" then return getError("Invalid newKey")
+
+    return editRegistryField(sectionName, key, newKey, newValue)
+End Sub
+
+' UIThread_log - TBD
+Sub UIThread_log(args) as Object
+    m.logger.logMessage(args.message, m.logger.verbosityMap[args.status])
+End Sub
+
+' UIThread_setLogVerbosity - TBD
+Sub UIThread_setLogVerbosity(args) as Object
+    level = args.level
+
+    if not FW_IsInteger(level) then return getError("Invalid level")
+
+    m.logger.setVerbosity(args.level)
+    return { success: true }
+End Sub
+
+' UIThread_setLogFormat - TBD
+Sub UIThread_setLogFormat(args) as Object
+    format = args.format
+
+    if not FW_IsString(format) then return getError("Invalid format")
+
+    m.logger.setFormat(args.format)
+    return { success: true }
+End Sub
+
+'=======================
+' Helpers functions
+'=======================
+
+' getLayout - Returns node layout fields (boundingRect, resolution, isMovable, isHeightResizable, isWidthResizable)
+' @param {object} node - node
+' @param {object} root - root of nodes (main scene)
+' @return {object} - node layout
+Sub getLayout(node, root) as Object
+    if not FW_IsSGNode(node) then return getError("Invalid Node Type")
+
+    if root = Invalid then root = m.top.getScene()
+
+    parent = node.getParent()
+
+    isWidthResizable = node.hasField("width")
+    isHeightResizable = node.hasField("height")
+    isMovable = false
+
+    if parent <> Invalid and not m.sceneBG.isSameNode(node)  then
+        isMovable = node.hasField("translation") and parent.ParentSubtype("LayoutGroup") <> ""
+    end if
+
+    return {
+        isMovable : isMovable,
+        isHeightResizable : isHeightResizable,
+        isWidthResizable : isWidthResizable,
+        boundingRect : node.sceneBoundingRect(),
+        resolution : root.getField("currentDesignResolution")
+    }
+End Sub
+
+' getItemObj - Returns node object
+' @param {object} item - node or filed
+' @param {string} index - field id or child index
+' @return {object} - node data object
+Sub getItemObj(item, index) as Dynamic
+    itemType = type(item)
+
+    if itemType = "roSGNode" then
+        return {
+            index: index,
+            id: item.id,
+            childrenCount: item.getChildCount(),
+            subtype: item.subtype(),
+            type: itemType,
+            value: "{object}"
+            isExposed: FW_AsBoolean(item.isExternallyExposed)
+        }
+    else if itemType = "roArray" or itemType = "roAssociativeArray" then
+        return {
+            id: index,
+            type: itemType,
+            value: "{object}"
+        }
+    else
+        return {
+            id: index,
+            type: itemType,
+            value: FW_AsString(item)
+        }
+    end if
+End Sub
+
+' getFieldList - Returns node field list
+' @param {object} node - node
+' @return {array} - list of fields
+Sub getFieldList(node) as Object
+    nodeType = type(node)
+
+    if nodeType = "roSGNode" then
+        fields = node.getFields()
+    else if nodeType = "roArray" or nodeType = "roAssociativeArray" then
+        fields = node
+    else
+        return getError("Invalid Node Type")
+    end if
+
+    fieldList = {}
+
+    result = 0
+    if type(fields) = "roArray" then
+        count = fields.count() - 1
+        for i = 0 to count
+            id = i.ToStr()
+            fieldList[id] = { item: getItemObj(fields[i], i) }
+            fieldList[id].item.id = i
+        end for
+    else
+        keys = fields.keys()
+        for each fieldId in keys
+            fieldList[fieldId] = { item: getItemObj(fields[fieldId], fieldId) }
+            if nodeType = "roSGNode" then fieldList[fieldId].item.fieldType = node.getFieldType(fieldId)
+        end for
+    end if
+
+    return fieldList
+End Sub
+
+' getChildList - Returns node children list
+' @param {object} node - node
+' @return {array} - list of children
+Sub getChildList(node) as Object
+    nodeType = type(node)
+
+    if nodeType = "roSGNode" then
+        childList = []
+        children = node.getChildren(-1, 0)
+        count = children.count()
+        if count > 0 then
+            count--
+            for i = 0 to count
+                if children[i] <> Invalid then
+                    childList[i] = { item: getItemObj(children[i], i) }
+                end if
+            end for
+        end if
+        return childList
+    else
+        return getError("Invalid Node Type")
+    end if
+End Sub
+
+' getItemList - Returns node children list and node data
+' @param {object} node - node
+' @param {object} index - node index
+' @return {object} - node data object and list of node children
+Sub getItemList(node, index) as Object
+    item = { item: getItemObj(node, index) }
+    nodeType = type(node)
+    if nodeType = "roSGNode" then
+        item.childList = getChildList(node)
+    else
+        return getError("Invalid Node Type")
+    end if
+    return item
+End Sub
+
+' getNodeTree - Goes through node children and returns node children hierarchy
+' @param {object} node - node or filed
+' @param {string} id - node index or filed id
+' @return {array} - node children hierarchy
+Sub getNodeTree(node, id, maxLevel) as Object
+    item = {
+        item: getItemObj(node, id),
+        childList: []
+    }
+
+    result = RALE_forEachChild(node, { maxLevel: maxLevel }, getNodeTreeCallback, { item: item })
+
+    if not result then
+        return getError("Invalid Node Type")
+    end if
+
+    return item
+End Sub
+
+Sub getNodeTreeCallback(node, index, parentObj, childObj, storage) as Boolean
+
+    if parentObj.item = Invalid then
+        parentObj.item = storage.item
+    end if
+
+    childItem = {
+        item : getItemObj(node, index),
+        childList : []
+    }
+
+    parentObj.item.childlist[index] = childItem
+
+    if childObj <> Invalid then
+        childObj.item = childItem
+    end if
+
+    return true
+End Sub
+
+' getNodeById - Search for node by id
+' @param {object} node - root node
+' @param {string} id - node id
+' @return {object} - found node
+Sub getNodeById(rootNode, id) as Object
+
+    if rootNode.id = id then
+        return rootNode
+    end if
+
+    storage = {
+        node: Invalid,
+        id: id
+    }
+
+    result = RALE_forEachChild(rootNode, {}, getNodeByIdCallback, storage)
+
+    if not result then
+        return getError("Invalid Node Type")
+    end if
+
+    return storage.node
+End Sub
+
+Sub getNodeByIdCallback(node, index, parentObj, childObj, storage) as Boolean
+
+    if node.id = storage.id then
+        storage.node = node
+        return false
+    end if
+
+    return true
+End Sub
+
+' getNodeByName - Search for node by name (subtype)
+' @param {object} node - root node
+' @param {string} name - node name (subtype)
+' @return {object} - found node
+Sub getNodeByName(rootNode, name) as Object
+
+    if rootNode.subtype() = name then
+        return rootNode
+    end if
+
+    storage = {
+        node: Invalid,
+        name: name
+    }
+
+    result = RALE_forEachChild(rootNode, {}, getNodeByNameCallback, storage)
+
+    if not result then
+        return getError("Invalid Node Type")
+    end if
+
+    return storage.node
+End Sub
+
+Sub getNodeByNameCallback(node, index, parentObj, childObj, storage) as Boolean
+
+    if node.subtype() = storage.name then
+        storage.node = node
+        return false
+    end if
+
+    return true
+End Sub
+
+' getNodeData - Returns node children hierarchy
+' @param {object} node - node or filed
+' @param {array} path - path to node
+' @param {object} root - root of nodes (main scene)
+' @return {object} - node data (item, fieldlist, layout)
+Sub getNodeData(node, path, root) as Object
+    index = RALE_getNodeIndexByPath(path)
+    if index = Invalid then return getError("Invalid Path")
+
+    result = {
+        item: getItemObj(node, index),
+        fieldlist: getFieldList(node),
+        layout: getLayout(node, root)
+    }
+    if type(node) = "roSGNode" then result.childlist = getChildList(node)
+
+    return result
+End Sub
+
+' addChild - Adds child to node by type and index
+' @param {object} node - parent node
+' @param {string} childType - path to node
+' @param {string} index - child index
+' @return {object} - status
+Sub addChild(node, childType, index) as Object
+    if not FW_IsSGNode(node) then return getError("Cannot Add Child. Invalid Node Type")
+
+    child = CreateObject("roSGNode", childType)
+    if not FW_IsSGNode(child) then return getError("Cannot Add Child. Invalid Component Type")
+
+    childCount = node.getChildCount()
+    if FW_IsInteger(index) and index < childCount then
+        node.insertChild(child, index)
+    else
+        index = childCount
+        node.appendChild(child)
+    end if
+
+    addedChild = node.getChild(index)
+    if type(addedChild) = "roSGNode" and addedChild.isSameNode(child) then
+        m.logger.debug("Child " + childType + " was added to " + FW_AsString(node) + " by index " + FW_AsString(index))
+        return { success: true, child: addedChild, index: index }
+    else
+        return getError("Cannot Add Child")
+    end if
+End Sub
+
+' removeChild - Removes child from node by index
+' @param {object} node - parent node
+' @param {string} index - child index
+' @return {object} - status
+Sub removeChild(node, index as Integer) as Object
+    if not FW_IsSGNode(node) then return getError("Invalid Node Type")
+    count = node.getChildCount()
+    if FW_IsSGNode(node.getChild(index)) then
+        node.removeChildIndex(index)
+        if node.getChildCount() < count then
+            m.logger.debug("Child with index " + FW_AsString(index) + " was removed from " + FW_AsString(node))
+            return { success: true }
+        end if
+        return getError("Node cannot be removed")
+    else
+        return getError("No child with this index")
+    end if
+End Sub
+
+' moveChild - Moves node child by index to another position
+' @param {object} node - parent node
+' @param {string} fromIndex - current child index
+' @param {string} toIndex - index where you want to move
+' @return {object} - status
+Sub moveChild(node, fromIndex, toIndex) as Object
+    if not FW_IsSGNode(node) then return getError("Invalid Node Type")
+
+    if fromIndex >= 0 AND toIndex >= 0
+        child = node.getChild(fromIndex)
+        if child <> Invalid then
+            node.removeChildIndex(fromIndex)
+            if toIndex > fromIndex then toIndex--
+            node.insertChild(child, toIndex)
+
+            m.logger.debug("Child of " + FW_AsString(node) + " was moved from index " + FW_AsString(fromIndex) + " to index " + FW_AsString(toIndex))
+            return { success: true }
+        else
+            return getError("No child with this index")
+        end if
+    else
+        return getError("fromIndex and toIndex must be positive integer")
+    end if
+End Sub
+
+' setSelectorView - Shows selector (live) view for node
+' @param {object} node - node
+' @param {string} nodeType - type of node
+' @param {array} nodePath - path to node
+' @return {object} - status
+Function setSelectorView(node, nodeType, nodePath) as Object
+    if m.selectorView <> Invalid then
+        if m.showSelectorView and nodeType = "roSGNode" and nodePath.count() > 0 then
+            m.selectorView.attachedView = node
+        else
+            m.selectorView.attachedView = Invalid
+        end if
+    end if
+End Function
+
+' setNodeField - Sets field into node
+' @param {object} node - node
+' @param {string} field - field id
+' @param {dynamic} value - field value
+' @param {string} fieldType - field type
+Sub setNodeField(node, field, value, fieldType) as Object
+    fields = {}
+    if fieldType = Invalid then
+        fields[field] = value
+        if node.hasField(field) then
+            node.setFields(fields)
+        else
+            node.addFields(fields)
+        end if
+    else
+        fields[field] = RALE_convertToType(value, fieldType)
+'        if node.hasField(field) and node.getFieldType(field) <> 'fieldType then
+'            node.removeField(field)
+'        end if
+'
+'        if not node.hasField(field) then
+'            node.addField(field, RALE_parseType(fieldType), false)
+'        end if
+        node.setFields(fields)
+    end if
+End Sub
+
+' setObjField - Sets field into AssociativeArray
+' @param {array} parentPath - node
+' @param {string} field - field id
+' @param {dynamic} value - field value
+' @param {string} fieldType - field type
+' @return {object} - status
+Sub setObjField(parentPath, field, value, fieldType) as Object
+    if fieldType <> Invalid then
+        value = RALE_convertToType(value, fieldType)
+    end if
+    return setInParentNode(parentPath, field, value)
+End Sub
+
+' setInParentNode - Sets field into parent node
+' @param {array} path - path to field
+' @param {string} field - field id
+' @param {dynamic} value - field value
+' @return {object} - parent node
+Function setInParentNode(path, field, value)
+    root = m.top.getScene()
+    parentPath = []
+    parentPath.append(path)
+    nodeList = RALE_getNodeListByPath(root, path)
+    if nodeList = Invalid then return getError("Invalid Path")
+
+    index = nodeList.count() - 1
+    parent = nodeList[index]
+    if type(parent) = "roSGNode" then
+        setNodeField(parent, field, value, Invalid)
+        return parent
+    end if
+
+    while type(parent) <> "roSGNode"
+        if type(parent) = "roArray" then
+            field = FW_AsInteger(field)
+            if field > parent.count() then
+                field = parent.count()
+            end if
+            parent[field] = value
+        else
+            parent[field] = value
+        end if
+        value = parent
+        index--
+        field = path[index].field
+        parent = nodeList[index]
+        parentPath.pop()
+    end while
+
+    parent = RALE_getNodeByPath(root, parentPath)
+    setNodeField(parent, field, value, Invalid)
+    return RALE_getNodeByPath(root, path)
+End Function
+
+' setFocus - Focus node
+' @param {object} node - node
+Sub setFocus(node) as Object
+    if not FW_IsSGNode(node) then return getError("Invalid Node Type")
+    node.setFocus(true)
+End Sub
+
+' getFocusedNodeObj - Returns focused node
+' @param {object} root - root
+' @param {object} maxDeep - search depth
+' @return {object} - focused node
+Function getFocusedNodeObj(root, maxDeep = 25) as Object
+    node = root
+    focusedChild = node.focusedChild
+    while maxDeep > 0 AND focusedChild <> Invalid AND not node.isSameNode(focusedChild)
+        node = focusedChild
+        focusedChild = node.focusedChild
+        maxDeep--
+    end while
+    return node
+End Function
+
+' getRegistrySections - Returns map of roRegistry
+' @return {object} - sections
+Function getRegistrySections() as Object
+    sections = {}
+
+    RALE_forEachRegistryField(getRegistrySectionsCallback, sections)
+
+    return sections
+End Function
+
+Sub getRegistrySectionsCallback(value, key, section, sections) as Boolean
+    if not FW_IsAssociativeArray(sections[section]) then
+        sections[section] = {}
+    end If
+
+    sections[section][key] = value
+
+    return true
+End Sub
+
+' clearRegistry - Clear roRegistry
+Function clearRegistry() as Object
+    RALE_forEachRegistrySection(clearRegistryCallback, {})
+
+    return { success: true }
+End Function
+
+Sub clearRegistryCallback(section, sectionName, storage) as Object
+    return removeRegistrySection(sectionName)
+End Sub
+
+' addRegistrySection - TBD
+' @return {object} - sections
+Function addRegistrySection(sectionName, section) as Object
+    RegistrySection = CreateObject("roRegistrySection", sectionName)
+    keys = section.keys()
+
+    for each key in keys
+        RegistrySection.write(key, section[key])
+    end for
+
+    RegistrySection.flush()
+    m.logger.debug("Registry section " + sectionName + " was added to roRegistry")
+
+    return  { success: true }
+End Function
+
+' removeRegistrySection - TBD
+' @return {object} - sections
+Function removeRegistrySection(sectionName) as Object
+    Registry = CreateObject("roRegistry")
+
+    success = Registry.delete(sectionName)
+
+    Registry.flush()
+
+    m.logger.debug("Registry section " + sectionName + " was removed from roRegistry")
+
+    return { success: success }
+End Function
+
+' addRegistryField - TBD
+' @return {object} - sections
+Function addRegistryField(sectionName, key, value) as Object
+    RegistrySection = CreateObject("roRegistrySection", sectionName)
+
+    success = RegistrySection.write(key, value)
+
+     m.logger.debug("Field " + key + " with value " + value + " was added to " + sectionName + " registry section")
+
+    return { success: success }
+End Function
+
+' removeRegistryField - TBD
+' @return {object} - sections
+Function removeRegistryField(sectionName, key) as Object
+    RegistrySection = CreateObject("roRegistrySection", sectionName)
+
+    success = RegistrySection.delete(key)
+
+     m.logger.debug("Field " + key + " was removed from " + sectionName + " registry section")
+
+    return { success: success }
+End Function
+
+' getRegistrySections - TBD
+' @return {object} - sections
+Function editRegistryField(sectionName, key, newKey, newValue) as Object
+    result = removeRegistryField(sectionName, key)
+
+    if result.success then
+        result = addRegistryField(sectionName, newKey, newValue)
+    end if
+
+    return result
+End Function
+
+' getError - Returns error object
+' @param {string} message - error message
+Function getError(message as String) as Object
+    m.logger.error(message)
+    return { error: { message: message } }
+End Function
+
+
+' @desc TrackerTask init function
+Sub init()
+    m.top.functionName = "tracker"
+    m.top.control = "RUN"
+
+    m.config = RALE_Config()
+    m.logger = RALE_Logger(m.config.defaultLogLevel, m.config.logFormat)
+    m.sceneBG = m.top.GetScene().getChild(0)
+    m.raleVersion = "2.1.7"
+    m.sessionId = CreateObject("roDeviceInfo").GetRandomUUID()
+
+    m.logger.info("Roku Advanced Layout Editor v." + m.raleVersion)
+End Sub
+
+' tracker - TrackerTask run function
+Sub tracker()
+    appInfo = CreateObject("roAppInfo")
+    handlersMap = getCommandMap()
+
+    RALE_InfoLog("TrackerTask run")
+
+    buffer = CreateObject("roByteArray")
+    buffer[m.config.bufferSize] = 0
+    messagePort = CreateObject("roMessagePort")
+    addr = CreateObject("roSocketAddress")
+
+    inputPort = CreateObject("roMessagePort")
+    inputObj  = CreateObject("roInput")
+    inputObj.SetMessagePort(inputPort)
+
+    while True
+        raleEnabled = true
+        port = 0
+        RALE_InfoLog("Waiting on ECP input request")
+        msg = wait(0, inputPort)
+
+        if type(msg) = "roInputEvent"
+            if msg.IsInput()
+                info = msg.GetInfo()
+                if type(info) = "roAssociativeArray" and info.rale <> Invalid then
+                    port = FW_AsInteger(info.port)
+                end if
+
+                nonDev = FW_AsBoolean(info.nonDev)
+
+            end if
+        end if
+
+        if raleEnabled and port > m.config.minSocketPort and port < m.config.maxSocketPort then
+            socketConnection(addr, messagePort, port, buffer, handlersMap, m.config)
+        end if
+    end while
+
+End Sub
+
+' socketConnection - Starts socket connection. Keep alive while connection won't be closed
+' @param {object} addr - roSocketAddress
+' @param {object} messagePort - roMessagePort
+' @param {number} port - socket connection port
+' @param {array} buffer - buffer for socket packets
+' @param {object} handlersMap - map that contains all RALE commands handlers
+' @param {object} config - configuration constants
+' @return {string} - connection status
+Sub socketConnection(addr, messagePort, port, buffer, handlersMap, config) as String
+    connections = {}
+    appManager = createObject("roAppManager")
+    screensaverTimer = CreateObject("roTimespan")
+    screensaverTimer.Mark()
+
+    addr.setPort(port)
+
+    tcpListen = CreateObject("roStreamSocket")
+    tcpListen.setMessagePort(messagePort)
+    tcpListen.setAddress(addr)
+    tcpListen.notifyReadable(true)
+    tcpListen.listen(4)
+
+    wasConnected = false
+
+    RALE_InfoLog("Start socket server on port " + FW_AsString(port))
+
+    while True
+
+        if not wasConnected then
+            event = wait(3000, messagePort)
+            if event = Invalid then
+                tcpListen.close()
+                RALE_WarningLog("No 'init' command received. Socket connection closed")
+                return "connection timeout"
+            end if
+        else
+            event = wait(config.commandTimeout, messagePort)
+        end if
+
+        ' Resets the screensaver timer
+        if screensaverTimer.TotalMilliseconds() > config.screensaverResetTimeout then
+            screensaverTimer.Mark()
+            appManager.UpdateLastKeyPressTime()
+        end if
+
+        ' ? type(event)
+        if type(event) = "roSocketEvent"
+            wasConnected = true
+            changedID = event.getSocketID()
+            if changedID = tcpListen.getID() and tcpListen.isReadable()
+                ' New
+                newConnection = tcpListen.accept()
+                if newConnection = Invalid
+                    RALE_WarningLog("Connection accept failed")
+                else
+                    RALE_InfoLog("Accepted new connection " + FW_AsString(newConnection.getID()))
+
+                    newConnection.notifyReadable(true)
+                    newConnection.setMessagePort(messagePort)
+                    connections[Stri(newConnection.getID())] = newConnection
+                end if
+            else
+                ' Activity on an open connection
+                connection = connections[Stri(changedID)]
+                closed = False
+                if connection.isReadable()
+                    received = connection.receive(buffer, 0, 100024)
+                    if received > 0
+                        timer = CreateObject("roTimespan")
+                        timer.Mark()
+
+                        valueType = type(m.lastUdpPacketRemainingContents)
+                        if NOT ((valueType = "String") OR (valueType = "roString")) then
+                            m.lastUdpPacketRemainingContents = ""
+                        end if
+                        remainingString = m.lastUdpPacketRemainingContents + buffer.ToAsciiString()
+                        m.lastUdpPacketRemainingContents = ""
+                        'print "incoming string " remainingString
+                        startIndex = 0
+                        continueToLoop = true
+                        while continueToLoop
+                            index = remainingString.instr(startIndex, "}{")
+                            if index < 0 then
+                                str = remainingString
+                                continueToLoop = false
+                            else
+                                index++
+                                str = remainingString.left(index)
+                                remainingString = remainingString.mid(index)
+                                if remainingString.right(1) <> "}" and remainingString.instr("}{") < 0 then
+                                    m.lastUdpPacketRemainingContents = remainingString
+                                    exit while
+                                end if
+                            end if
+                          end while
+
+                          request = ParseJson(str)
+                        buffer = CreateObject("roByteArray")
+                        buffer[100024] = 0
+
+                        if request <> Invalid then
+                            response = {}
+                            if request["command"] <> Invalid then
+
+                                handler = handlersMap[request["command"]]
+                                if handler <> Invalid then
+                                    RALE_DebugLog("Handling command: " + request["command"])
+                                    RALE_DebugLog("Received arguments: " + FW_AsString(request["args"]))
+
+                                    response = callCommand(handler, request["args"])
+                                else
+                                    RALE_ErrorLog("No such command: " + request["command"])
+
+                                    response = getError("No such command")
+                                end if
+                            end if
+                            id = request.uuid
+                            idLen = FW_AsString(Len(id))
+                            json = FormatJson(response)
+                            res = "[start][uuid:" + idLen + "]" + id + json + "[end]"
+
+                            resList = RALE_splitStringByLength(res, 3000)
+                            count = resList.count() - 1
+                            for i = 0 to count
+                                connection.SendStr(resList[i])
+                                sleep(20)
+                            end for
+                            RALE_DebugLog("Command handled in: " + FW_AsString(timer.TotalMilliseconds()) + "ms")
+                        end if
+                    else if received=0 ' client closed
+                        closed = True
+                    end if
+                end if
+                if closed or not connection.eOK()
+                    connection.close()
+                    connections.delete(Stri(changedID))
+                    exit while
+                end if
+            end if
+        end if
+    end while
+
+    tcpListen.close()
+    for each id in connections
+        connections[id].close()
+    end for
+
+    RALE_InfoLog("Socket connection closed")
+
+    return "connection closed"
+End Sub
+
+'IMPORTS=
+'=====================
+' Types
+'=====================
+
+'*************************************************
+' FW_IsXmlElement - check if value contains XMLElement interface
+' @param value As Dynamic
+' @return As Boolean - true if value contains XMLElement interface, else return false
+'*************************************************
+Function FW_IsXmlElement(value As Dynamic) As Boolean
+    Return FW_IsValid(value) And GetInterface(value, "ifXMLElement") <> invalid
+End Function
+
+'*************************************************
+' FW_IsFunction - check if value contains Function interface
+' @param value As Dynamic
+' @return As Boolean - true if value contains Function interface, else return false
+'*************************************************
+Function FW_IsFunction(value As Dynamic) As Boolean
+    Return FW_IsValid(value) And GetInterface(value, "ifFunction") <> invalid
+End Function
+
+'*************************************************
+' FW_IsBoolean - check if value contains Boolean interface
+' @param value As Dynamic
+' @return As Boolean - true if value contains Boolean interface, else return false
+'*************************************************
+Function FW_IsBoolean(value As Dynamic) As Boolean
+    Return FW_IsValid(value) And GetInterface(value, "ifBoolean") <> invalid
+End Function
+
+'*************************************************
+' FW_IsInteger - check if value type equals Integer
+' @param value As Dynamic
+' @return As Boolean - true if value type equals Integer, else return false
+'*************************************************
+Function FW_IsInteger(value As Dynamic) As Boolean
+    Return FW_IsValid(value) And GetInterface(value, "ifInt") <> invalid And (Type(value) = "roInt" Or Type(value) = "roInteger" Or Type(value) = "Integer")
+End Function
+
+'*************************************************
+' FW_IsFloat - check if value contains Float interface
+' @param value As Dynamic
+' @return As Boolean - true if value contains Float interface, else return false
+'*************************************************
+Function FW_IsFloat(value As Dynamic) As Boolean
+    Return FW_IsValid(value) And GetInterface(value, "ifFloat") <> invalid
+End Function
+
+'*************************************************
+' FW_IsDouble - check if value contains Double interface
+' @param value As Dynamic
+' @return As Boolean - true if value contains Double interface, else return false
+'*************************************************
+Function FW_IsDouble(value As Dynamic) As Boolean
+    Return FW_IsValid(value) And GetInterface(value, "ifDouble") <> invalid
+End Function
+
+'*************************************************
+' FW_IsLongInteger - check if value contains LongInteger interface
+' @param value As Dynamic
+' @return As Boolean - true if value contains LongInteger interface, else return false
+'*************************************************
+Function FW_IsLongInteger(value As Dynamic) As Boolean
+    Return FW_IsValid(value) And GetInterface(value, "ifLongInt") <> invalid
+End Function
+
+
+'*************************************************
+' FW_IsNumber - check if value contains LongInteger or Integer or Double or Float interface
+' @param value As Dynamic
+' @return As Boolean - true if value is number, else return false
+'*************************************************
+Function FW_IsNumber(value As Dynamic) As Boolean
+    Return FW_IsLongInteger(value) or FW_IsDouble(value) or FW_IsInteger(value) or FW_IsFloat(value)
+End Function
+
+'*************************************************
+' FW_IsList - check if value contains List interface
+' @param value As Dynamic
+' @return As Boolean - true if value contains List interface, else return false
+'*************************************************
+Function FW_IsList(value As Dynamic) As Boolean
+    Return FW_IsValid(value) And GetInterface(value, "ifList") <> invalid
+End Function
+
+'*************************************************
+' FW_IsArray - check if value contains Array interface
+' @param value As Dynamic
+' @return As Boolean - true if value contains Array interface, else return false
+'*************************************************
+Function FW_IsArray(value As Dynamic) As Boolean
+    Return FW_IsValid(value) And GetInterface(value, "ifArray") <> invalid
+End Function
+
+'*************************************************
+' FW_IsAssociativeArray - check if value contains AssociativeArray interface
+' @param value As Dynamic
+' @return As Boolean - true if value contains AssociativeArray interface, else return false
+'*************************************************
+Function FW_IsAssociativeArray(value As Dynamic) As Boolean
+    Return FW_IsValid(value) And GetInterface(value, "ifAssociativeArray") <> invalid
+End Function
+
+'*************************************************
+' FW_IsSGNode - check if value contains SGNodeChildren interface
+' @param value As Dynamic
+' @return As Boolean - true if value contains SGNodeChildren interface, else return false
+'*************************************************
+Function FW_IsSGNode(value As Dynamic) As Boolean
+    Return FW_IsValid(value) And GetInterface(value, "ifSGNodeChildren") <> invalid
+End Function
+
+'*************************************************
+' FW_IsString - check if value contains String interface
+' @param value As Dynamic
+' @return As Boolean - true if value contains String interface, else return false
+'*************************************************
+Function FW_IsString(value As Dynamic) As Boolean
+    Return FW_IsValid(value) And GetInterface(value, "ifString") <> invalid
+End Function
+
+'*************************************************
+' FW_IsNotEmptyString - check if value contains String interface and length more 0
+' @param value As Dynamic
+' @return As Boolean - true if value contains String interface and length more 0, else return false
+'*************************************************
+Function FW_IsNotEmptyString(value As Dynamic) As Boolean
+    Return FW_IsString(value) and len(value) > 0
+End Function
+
+'*************************************************
+' FW_IsDateTime - check if value contains DateTime interface
+' @param value As Dynamic
+' @return As Boolean - true if value contains DateTime interface, else return false
+'*************************************************
+Function FW_IsDateTime(value As Dynamic) As Boolean
+    Return FW_IsValid(value) And (GetInterface(value, "ifDateTime") <> invalid Or Type(value) = "roDateTime")
+End Function
+
+'*************************************************
+' FW_IsValid - check if value initialized and not equal invalid
+' @param value As Dynamic
+' @return As Boolean - true if value initialized and not equal invalid, else return false
+'*************************************************
+Function FW_IsValid(value As Dynamic) As Boolean
+    Return Type(value) <> "<uninitialized>" And value <> invalid
+End Function
+
+'*************************************************
+' FW_ValidStr - return value if his contains String interface else return empty string
+' @param value As Object
+' @return As String - value if his contains String interface else return empty string
+'*************************************************
+Function FW_ValidStr(obj As Object) As String
+    if obj <> invalid and GetInterface(obj, "ifString") <> invalid
+        return obj
+    else
+        return ""
+    endif
+End Function
+
+'*************************************************
+' FW_AsString - convert input to String if this possible, else return empty string
+' @param input As Dynamic
+' @return As String - return converted string
+'*************************************************
+Function FW_AsString(input As Dynamic) As String
+    If FW_IsValid(input) = False Then
+        Return ""
+    Else If FW_IsString(input) Then
+        Return input
+    Else If FW_IsInteger(input) or FW_IsLongInteger(input) or FW_IsBoolean(input)Then
+        Return input.ToStr()
+    Else If FW_IsFloat(input) or FW_IsDouble(input) Then
+        Return Str(input).Trim()
+    Else If FW_IsBoolean(input) Then
+        If input Then
+            Return "true"
+        Else
+            Return "false"
+        End If
+    Else If FW_IsSGNode(input) Then
+        return input.subtype()
+    Else If FW_IsArray(input) Then
+        result = ""
+        For each item in input
+            result = result + FW_AsString(item) + ", "
+        End For
+        Return "[" + Left(result, Len(result) - 2) + "]"
+    Else If FW_IsAssociativeArray(input) Then
+        result = ""
+        For each key in input
+            result = result + key + " : " + FW_AsString(input[key]) + ", "
+        End For
+        Return "{ " + Left(result, Len(result) - 2) + " }"
+    End If
+    return ""
+End Function
+
+'*************************************************
+' FW_AsInteger - convert input to Integer if this possible, else return 0
+' @param input As Dynamic
+' @return As Integer - return converted Integer
+'*************************************************
+Function FW_AsInteger(input As Dynamic) As Integer
+    If FW_IsValid(input) = False Then
+        Return 0
+    Else If FW_IsString(input) Then
+        Return input.ToInt()
+    Else If FW_IsInteger(input) Then
+        Return input
+    Else If FW_IsFloat(input) or FW_IsDouble(input) or FW_IsLongInteger(input) Then
+        Return Int(input)
+    Else
+        Return 0
+    End If
+End Function
+
+'*************************************************
+' FW_AsLongInteger - convert input to LongInteger if this possible, else return 0
+' @param input As Dynamic
+' @return As Integer - return converted LongInteger
+'*************************************************
+Function FW_AsLongInteger(input As Dynamic) As LongInteger
+    If FW_IsValid(input) = False Then
+        Return 0
+    Else If FW_IsString(input) Then
+        Return FW_AsInteger(input)
+    Else If FW_IsLongInteger(input) or FW_IsFloat(input) or FW_IsDouble(input) or FW_IsInteger(input) Then
+        Return input
+    Else
+        Return 0
+    End If
+End Function
+
+'*************************************************
+' FW_AsFloat - convert input to Float if this possible, else return 0.0
+' @param input As Dynamic
+' @return As Float - return converted Float
+'*************************************************
+Function FW_AsFloat(input As Dynamic) As Float
+    If FW_IsValid(input) = False Then
+        Return 0.0
+    Else If FW_IsString(input) Then
+        Return input.ToFloat()
+    Else If FW_IsInteger(input) Then
+        Return (input / 1)
+    Else If FW_IsFloat(input) or FW_IsDouble(input) or FW_IsLongInteger(input) Then
+        Return input
+    Else
+        Return 0.0
+    End If
+End Function
+
+'*************************************************
+' FW_AsDouble - convert input to Double if this possible, else return 0.0
+' @param input As Dynamic
+' @return As Float - return converted Double
+'*************************************************
+Function FW_AsDouble(input As Dynamic) As Double
+    If FW_IsValid(input) = False Then
+        Return 0.0
+    Else If FW_IsString(input) Then
+        Return FW_AsFloat(input)
+    Else If FW_IsInteger(input) or FW_IsLongInteger(input) or FW_IsFloat(input) or FW_IsDouble(input) Then
+        Return input
+    Else
+        Return 0.0
+    End If
+End Function
+
+'*************************************************
+' FW_AsBoolean - convert input to Boolean if this possible, else return False
+' @param input As Dynamic
+' @return As Boolean
+'*************************************************
+Function FW_AsBoolean(input As Dynamic) As Boolean
+    If FW_IsValid(input) = False Then
+        Return False
+    Else If FW_IsString(input) Then
+        Return LCase(input) = "true"
+    Else If FW_IsInteger(input) Or FW_IsFloat(input) Then
+        Return input <> 0
+    Else If FW_IsBoolean(input) Then
+        Return input
+    Else
+        Return False
+    End If
+End Function
+
+'*************************************************
+' FW_AsArray - if type of value equals array return value, else return array with one element [value]
+' @param value As Object
+' @return As Object - roArray
+'*************************************************
+Function FW_AsArray(value As Object) As Object
+    If FW_IsValid(value)
+        If Not FW_IsArray(value) Then
+            Return [value]
+        Else
+            Return value
+        End If
+    End If
+    Return []
+End Function
+
+'*************************************************
+' FW_ValidAA - check if obj contains all keys
+' @param obj As Object   - roAssociativeArray
+' @param keys as Object  - roArray of keys(string) to check
+' @param delim as String - key delimiter (default = ".")
+' @return As Boolean - return true if type of obj equals AssociativeArray and obj contains all keys, else return false
+'*************************************************
+Function FW_ValidAA(obj As Object, keys as Object, delim = "." as String) as Boolean
+    'All keys on level 0
+    if not FW_IsAssociativeArray(obj) or not FW_IsNotEmptyString(delim) or not FW_isArray(keys) then
+        return false
+    end if
+    for each key in Keys
+        subKeys = key.split(delim)
+        aa_check = obj
+        'go down the hierarchy key.subkey.subsubkey...
+        for each subkey in subKeys
+            if FW_IsAssociativeArray(aa_check) and aa_check[subkey] <> invalid then
+                aa_check = aa_check[subkey]
+            else
+                print "Key::"; key
+                print "subkey::"; subkey
+                'printAA(obj)
+                return false
+
+            end if
+        end for
+
+    end for
+    return true
+end Function
+
+'*************************************************
+' FW_GetSubElement - check if obj contains subElementTree element and return him
+' @param element as Dynamic - roAssociativeArray
+' @param subElementTree as Dynamic - String keys tree
+' @param delim as String - key delimiter (default = ".")
+' @return As Dynamic - if exist obj[subElementTree] value else invalid
+'*************************************************
+function FW_GetSubElement(element as Dynamic, subElementTree as Dynamic, delim = "." as String) as Dynamic
+    if FW_IsValid(element) = false or FW_IsValid(subElementTree) = false then
+        return invalid
+    end if
+
+    subElementTreeArray = []
+    result = element
+
+    if FW_IsNotEmptyString(subElementTree) and FW_IsNotEmptyString(delim) then
+       subElementTreeArray = subElementTree.split(delim)
+    else if FW_IsArray(subElementTree) then
+       subElementTreeArray = subElementTree
+    else
+        result = invalid
+    end if
+
+    for each field in subElementTreeArray
+        if FW_IsSGNode(result) then
+            key = FW_AsString(field)
+            if result.HasField(key) then
+                result = result.GetField(key)
+            else
+                index = FW_AsInteger(field)
+                if (index = 0 and key <> "0") or index < 0 or index >= result.GetChildCount() then
+                    result = invalid
+                    exit for
+                end if
+                result = result.GetChild(index)
+            end if
+        else if FW_IsAssociativeArray(result) then
+            result = result.LookupCI(FW_AsString(field))        'use case-insensitive lookup for AAs
+        else if FW_IsArray(result) then
+            index = FW_AsInteger(field)
+            if (index = 0 and FW_AsString(field) <> "0") or index < 0 or index >= result.Count() then     'index is not an integer or out of range?
+                result = invalid
+                exit for
+            end if
+            result = result[index]
+        else
+            result = invalid
+            exit for
+        end if
+    end for
+
+    return result
+end function
+
+
+' RALE_parseType - Parse type name to brs type
+' @param {string} _type - type
+' @return {string} - brs type
+Function RALE_parseType(_type as String) as String
+    _type =  LCase(_type)
+    convertMap = {
+        "rointeger" : "integer",
+        "roint"     : "integer",
+        "int"       : "integer",
+        "num"       : "integer",
+        "number"    : "integer",
+
+        "rofloat" : "float",
+
+        "rostring" : "string",
+        "text"     : "string",
+        "str"      : "string",
+
+        "roboolean" : "bool",
+        "boolean"   : "bool",
+
+        "rosgnode" : "node",
+
+        "roarray" : "array",
+        "array"   : "array",
+        "arr"     : "array",
+
+        "object"             : "assocarray",
+        "associativearray"   : "assocarray",
+        "roassociativearray" : "assocarray"
+    }
+    if convertMap[_type] <> Invalid then return convertMap[_type]
+    return _type
+End function
+
+' RALE_convertToType - Convert variable to type
+' @param {dynamic} value - variable value
+' @param {string} _type - type to which you want to convert
+' @return {dynamic} - new variable value
+Function RALE_convertToType(value as Dynamic, _type as String) as Dynamic
+    _type = RALE_parseType(_type)
+
+    convertMap = {
+        "integer" : FW_AsInteger,
+        "float" : FW_AsFloat,
+        "bool" : FW_AsBoolean,
+        "string" : FW_AsString,
+        "array" : FW_AsArray,
+    }
+
+    if _type = "assocarray" and type(value) <> "roAssociativeArray" then
+        value = CreateObject("roAssociativeArray")
+    end if
+    if _type = "array" and type(value) <> "roArray" then
+        value = FW_AsString(value).split(",")
+    end if
+    if _type = "node" then
+        value = CreateObject("roSGNode", FW_AsString(value))
+    end if
+
+    if convertMap[_type] <> Invalid then
+        return convertMap[_type](value)
+    end if
+    return value
+End function
+
+' RALE_getNodeByItem - Returns node field or child by item data
+' @param {dynamic} item - item data
+' @param {dynamic} node - type to which you want to convert
+' @return {dynamic} - node field or child
+Function RALE_getNodeByItem(item as Dynamic, node as Dynamic) as Dynamic
+    itemType = type(item)
+    if itemType <> "roAssociativeArray" then return Invalid
+
+    nodeType = type(node)
+    if nodeType <> "roSGNode" and nodeType <> "roArray" and nodeType <> "roAssociativeArray" then
+        return Invalid
+    end if
+
+    if nodeType = "roSGNode" and item.child <> Invalid then
+        index = FW_AsInteger(item.child)
+        if index = 0 and FW_AsString(item.child) <> "0" then return Invalid
+
+        return node.getChild(index)
+    else if item.field <> Invalid then
+        key = item.field
+        if nodeType = "roSGNode" then
+            if node.hasField(key) then
+                return node.getField(key)
+            else
+                return Invalid
+            end if
+        else
+            key = item.field
+            if nodeType = "roArray" then
+                key = FW_AsInteger(key)
+                if key = 0 and FW_AsString(item.field) <> "0" then return Invalid
+            end if
+
+            return node[key]
+        end if
+    else
+        return Invalid
+    end if
+End function
+
+' RALE_getNodeByPath - Returns node by path
+' @param {object} root - root of nodes (main scene)
+' @param {array} path - path to node (for example [{ child: 1 }, { field: "fieldId" }])
+' @return {dynamic} - node or Invalid (if no node by this path)
+Function RALE_getNodeByPath(root as Dynamic, path as Object) as Dynamic
+    node = root
+
+    if type(path) <> "roArray" then return Invalid
+
+    for each item in path
+        node = RALE_getNodeByItem(item, node)
+        if node = Invalid then return Invalid
+    end for
+
+    return node
+End function
+
+' RALE_getNodeIndex - Returns node index
+' @param {object} node - node
+' @param {object} parent - node parent
+' @return {integer} - node index
+Function RALE_getNodeIndex(node, parent) as Integer
+    for i = 0 to parent.getchildCount() - 1
+        if parent.getChild(i).isSameNode(node) then return i
+    end for
+    return -1
+End Function
+
+' RALE_getNodePath - Returns node path
+' @param {object} node - node
+' @param {object} root - root
+' @return {array} - node path
+Function RALE_getNodePath(node, root) as Object
+    path = []
+
+    if node <> Invalid and root <> Invalid then
+        parent = node.getParent()
+        while parent <> Invalid
+            index = RALE_getNodeIndex(node, parent)
+            if index = -1 then exit while
+
+            node = parent
+            parent = node.getParent()
+
+            path.unshift({ child: index })
+
+            if root.isSameNode(node) then exit while
+        end while
+    end if
+    return path
+End Function
+
+' RALE_getNodeListByPath - Returns node by path
+' @param {object} root - root of nodes (main scene)
+' @param {array} path - path to node (for example [{ child: 1 }, { field: "fieldId" }])
+' @return {dynamic} - list of nodes (parent nodes and selected one) or Invalid (if no node by this path)
+Function RALE_getNodeListByPath(root as Dynamic, path as Object) as Dynamic
+    node = root
+    nodeList = [node]
+
+    if type(path) <> "roArray" then return Invalid
+
+    for each item in path
+        node = RALE_getNodeByItem(item, node)
+        if node = Invalid then return Invalid
+        nodeList.push(node)
+    end for
+
+    return nodeList
+End function
+
+' RALE_getNodeIndexByPath - Returns node index or id by path
+' @param {array} path - path to node (for example [{ child: 1 }, { field: "fieldId" }])
+' @return {dynamic} - node index or id or Invalid (if no node by this path)
+Function RALE_getNodeIndexByPath(path) as Dynamic
+    if type(path) <> "roArray" then return Invalid
+
+    length = path.count()
+    if length = 0 then return ""
+
+    index = path[length - 1]
+
+    if type(index) <> "roAssociativeArray" then return Invalid
+
+    if index.child <> Invalid then
+        index = index.child
+    else if index.field <> Invalid then
+        index = index.field
+    else
+        return Invalid
+    end if
+
+    return index
+End function
+
+' RALE_splitStringByLength - Splits string on parts and store in array
+' @param {string} str - string which will be splitted
+' @param {integer} length - max part langth
+' @return {array} - splitted string
+Function RALE_splitStringByLength(str, length) as Dynamic
+    list = []
+    strLength = str.len()
+    currentPosition = 0
+
+    while currentPosition < strLength
+        list.push(str.mid(currentPosition, length))
+        currentPosition = currentPosition + length
+    end while
+
+    return list
+End function
+
+' RALE_forEachNode - Goes through all the children and call the callback function
+' @param {object} node - root node
+' @param {object} options - options
+' @param {function} callback - callback function that will be called for each node
+Function RALE_forEachChild(node, options, callback, storage) as Dynamic
+    nodeType = type(node)
+    maxLevel = 50
+
+    if FW_IsInteger(options.maxLevel) then
+        maxLevel = options.maxLevel
+    end if
+
+    if nodeType = "roSGNode" then
+        level = 0
+        stateStack = []
+        stateObj = {
+            index : 0
+            node : node
+        }
+
+        childCount = node.getchildcount()
+        while true
+
+            if childCount > stateObj.index then
+                childIndex = stateObj.index
+                childNode = node.getchild(childIndex)
+
+                stateObj.index++
+
+                if childNode <> invalid then
+                    childCountTmp = childNode.getchildcount()
+
+                    parentObj = stateObj
+                    childObj = Invalid
+
+                    if childCountTmp > 0 and level < maxLevel then
+                        childCount = childCountTmp
+                        stateStack.push(stateObj)
+                        level++
+
+                        stateObj = {
+                            index : 0
+                            node : childNode
+                        }
+                        childObj = stateObj
+
+                        node = childNode
+                    end if
+
+                    result = callback(childNode, childIndex, parentObj, childObj, storage)
+
+                    if not result then
+                        exit while
+                    end if
+                end if
+            else if level > 0 then
+                stateObj = stateStack.pop()
+                level--
+                node = stateObj.node
+                childCount = stateObj.node.getchildcount()
+            else
+                exit while
+            end if
+        end while
+    else
+        return false
+    end if
+
+    return true
+End function
+
+' RALE_forEachRegistryField - Goes through all the roRegistry and call the callback function for each field
+' @param {function} callback - callback function that will be called for each field
+Function RALE_forEachRegistryField(callback, storage) as Dynamic
+    Registry = CreateObject("roRegistry")
+
+    for each section in Registry.GetSectionList()
+        RegistrySection = CreateObject("roRegistrySection", section)
+        for each key in RegistrySection.GetKeyList()
+            callback(RegistrySection.Read(key), key, section, storage)
+        end for
+    end for
+End function
+
+' RALE_forEachRegistrySection - Goes through all the roRegistry and call the callback function for each section
+' @param {function} callback - callback function that will be called for each section
+Function RALE_forEachRegistrySection(callback, storage) as Dynamic
+    Registry = CreateObject("roRegistry")
+
+    for each section in Registry.GetSectionList()
+        callback(CreateObject("roRegistrySection", section), section, storage)
+    end for
+End function
+
+Function RALE_DebugLog(message as String)
+    callCommand("UIThread_log", {
+        message: message,
+        status: "debug"
+    })
+End Function
+
+Function RALE_InfoLog(message as String)
+    callCommand("UIThread_log", {
+        message: message,
+        status: "info"
+    })
+End Function
+
+Function RALE_WarningLog(message as String)
+    callCommand("UIThread_log", {
+        message: message,
+        status: "warning"
+    })
+End Function
+
+Function RALE_ErrorLog(message as String)
+    callCommand("UIThread_log", {
+        message: message,
+        status: "error"
+    })
+End Function
diff --git a/tests/src/components/debug/RALETrackerTask.xml b/tests/src/components/debug/RALETrackerTask.xml
new file mode 100644
index 00000000..d6c109d6
--- /dev/null
+++ b/tests/src/components/debug/RALETrackerTask.xml
@@ -0,0 +1,56 @@
+<component
+    name="TrackerTask"
+    extends="Task">
+
+  <interface>
+    <field
+        id="event"
+        type="assocarray" />
+    <field
+        id="isExternallyExposed"
+        type="boolean"
+        value="true" />
+
+    <function name="UIThread_init" />
+    <function name="UIThread_showSelectorView" />
+    <function name="UIThread_hideSelectorView" />
+
+    <function name="UIThread_selectNode" />
+    <function name="UIThread_updateNode" />
+    <function name="UIThread_getNodeData" />
+
+    <function name="UIThread_getItemList" />
+    <function name="UIThread_getNodeTree" />
+    <function name="UIThread_getNodeById" />
+    <function name="UIThread_getNodeByName" />
+
+    <function name="UIThread_addChild" />
+    <function name="UIThread_removeChild" />
+    <function name="UIThread_moveChild" />
+
+    <function name="UIThread_setField" />
+    <function name="UIThread_removeField" />
+
+    <function name="UIThread_setFocus" />
+    <function name="UIThread_selectFocusedNode" />
+
+    <function name="UIThread_setBoundingRect" />
+
+    <function name="UIThread_getRegistrySections" />
+    <function name="UIThread_clearRegistry" />
+    <function name="UIThread_addRegistrySection" />
+    <function name="UIThread_removeRegistrySection" />
+    <function name="UIThread_addRegistryField" />
+    <function name="UIThread_removeRegistryField" />
+    <function name="UIThread_editRegistryField" />
+
+    <function name="UIThread_log" />
+    <function name="UIThread_setLogVerbosity" />
+    <function name="UIThread_setLogFormat" />
+
+    <function name="UIThread_setRulerLine" />
+    <function name="UIThread_setRulerLines" />
+    <function name="UIThread_removeRulerLine" />
+    <function name="UIThread_removeAllRulerLines" />
+  </interface>
+</component>
\ No newline at end of file
diff --git a/tests/src/components/tests/NodeExampleTests.bs b/tests/src/components/tests/NodeExampleTests.bs
new file mode 100644
index 00000000..d6d8fdc8
--- /dev/null
+++ b/tests/src/components/tests/NodeExampleTests.bs
@@ -0,0 +1,2 @@
+' import "pkg:/source/tests/rooibosFunctionMap.brs"
+import "pkg:/source/rooibos.bs"
\ No newline at end of file
diff --git a/frameworkTests/components/tests/NodeExampleTests.xml b/tests/src/components/tests/NodeExampleTests.xml
similarity index 100%
rename from frameworkTests/components/tests/NodeExampleTests.xml
rename to tests/src/components/tests/NodeExampleTests.xml
diff --git a/samples/example/manifest b/tests/src/manifest
similarity index 67%
rename from samples/example/manifest
rename to tests/src/manifest
index be7b71cb..95212f6a 100644
--- a/samples/example/manifest
+++ b/tests/src/manifest
@@ -1,4 +1,4 @@
-title=Rooibos Overview
+title=maestro sample
 major_version=0
 minor_version=1
 build_version=1
diff --git a/tests/src/source/AssertionTests.bs b/tests/src/source/AssertionTests.bs
new file mode 100644
index 00000000..f93ae48f
--- /dev/null
+++ b/tests/src/source/AssertionTests.bs
@@ -0,0 +1,636 @@
+'@TestSuite [RBSA] Rooibos assertion tests
+
+namespace Tests.Assertions
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests basic assertions
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test Fail
+  function fail() as void
+
+    assertResult = m.Fail("reason")
+    isFail = m.currentResult.isFail
+    m.currentResult.Reset()
+
+    m.assertFalse(assertResult)
+    m.assertTrue(isFail)
+  end function
+
+  '@Test AssertTrue
+  '@Params[true, true]
+  '@Params[false, false]
+  '@Params[invalid, false]
+  '@Params[0, false]
+  '@Params[1, false]
+  '@Params["test", false]
+  function assertTrue(value, expectedAssertResult) as void
+
+    assertResult = m.assertTrue(value)
+    isFail = m.currentResult.isFail
+    m.currentResult.Reset()
+
+    m.assertEqual(assertResult, expectedAssertResult)
+    m.assertEqual(isFail, not expectedAssertResult)
+  end function
+
+  '@Test AssertFalse
+  '@Params[false, true]
+  '@Params[true, false]
+  '@Params[invalid, false]
+  '@Params[0, false]
+  '@Params[1, false]
+  '@Params["test", false]
+  function assertFalse(value, expectedAssertResult) as void
+
+    assertResult = m.assertFalse(value)
+
+    isFail = m.currentResult.isFail
+    m.currentResult.Reset()
+
+    m.assertEqual(assertResult, expectedAssertResult)
+    m.assertEqual(isFail, not expectedAssertResult)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests AssertArrayContainsAAs
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test Fail
+  '@Params[[{"one":1}], [{"one":2}]]
+  '@Params[[{"one":1}], [{"one":"a"}]]
+  '@Params[[{"one":1}], [{}]]
+  '@Params[[{"one":1}], [invalid]]
+  '@Params[[{"one":1}], []]
+  '@Params[[{"one":1}], invalid]
+  '@Params[[{"one":1}], [[]] ]
+  '@Params[[{"one":1}], ["wrong"] ]
+  '@Params[[{"one":1}], [2] ]
+  '@Params[[{"one":"a"}], [{"one":1}] ]
+  '@Params[[{"two":1}], [{"one":1}] ]
+  '@Params[[invalid], [{"one":1}] ]
+  '@Params[invalid, [{"one":1}] ]
+  '@Params[[{"one":1, "two":2}], [{"one":"1"}] ]
+  '@Params[[{"one":1}, {"two":2}], [{"one":"1"}, {"two":"a"}] ]
+  '@Params[[{"one":1}, {"two":2}], [{"a":1}, {"a":1}, {"a":1}] ]
+  function assertArrayContainsAAs_Fail(expectedAAs, items) as void
+
+    assertResult = m.assertArrayContainsAAs(items, expectedAAs)
+
+    isFail = m.currentResult.isFail
+    m.currentResult.Reset()
+
+    m.assertFalse(assertResult)
+    m.assertTrue(isFail)
+  end function
+
+
+  '@Test pass
+  '@Params[[], []]
+  '@Params[[{}], [{}]]
+  '@Params[[{"one":1}], [{"one":1}]]
+  '@Params[[{"one":1, "two":2}], [{"one":1, "two":2}]]
+  '@Params[[{"one":1, "two":2}], [{ "two":2, "one":1}]]
+  '@Params[[{"one":1, "two":2}, {"one":1}], [{"one":1}, { "two":2, "one":1}]]
+  '@Params[[{"one":1, "two":2}, {"one":1}, {"three":3}], [{"one":1}, {"three":3}, { "two":2, "one":1}]]
+  function assertArrayContainsAAs_Pass(expectedAAs, items) as void
+
+    assertResult = m.assertArrayContainsAAs(items, expectedAAs)
+
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertTrue(assertResult)
+    m.assertFalse(isFail)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests global is present on testSuite
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@BeforeEach
+  function assertGlobal_beforeEach() as void
+    m.beforeEachGlobal = m.global
+  end function
+
+  '@AfterEach
+  function assertGlobal_afterEach() as void
+    m.afterEachGlobal = m.global
+  end function
+
+  '@Test global is in test
+  function assertGlobalIsPassedIntoTest() as void
+    m.assertNotInvalid(m.global)
+  end function
+
+  '@Test global is in before each and after each
+  function assertGlobalIsPassedInto_beforeEach_and_afterEach() as void
+    m.assertNotInvalid(m.global)
+    m.assertNotInvalid(m.beforeEachGlobal)
+    m.assertNotInvalid(m.afterEachGlobal)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests AssertArrayContainsOnlyValuesOfType
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test pass
+  '@Params[["one", "two", "three"], "String"]
+  '@Params[[1, 2, 3], "Integer"]
+  '@Params[[true, true, false], "Boolean"]
+  '@Params[[[true, true], [false, false]], "Array"]
+  '@Params[[{"test":1}, {"test":1}], "AssociativeArray"]
+  function assertArrayContainsOnlyValuesOfType_Pass(values, typeName) as void
+
+    assertResult = m.assertArrayContainsOnlyValuesOfType(values, typeName)
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertTrue(assertResult)
+    m.assertFalse(isFail)
+
+  end function
+
+  '@Test fail
+  '@Params[["one", 2, "three"], "String"]
+  '@Params[[1, "two", 3], "Integer"]
+  '@Params[[true, "true", false], "Boolean"]
+  '@Params[[[true, true], false, false], "Array"]
+  '@Params[[{"test":1}, "notAA"], "AssociativeArray"]
+  '@Params[["one", "two", "three"], "UnknownType"]
+  '@Params[["one", "two", "three"], "Integer"]
+  '@Params[[1, 2, 3], "String"]
+  '@Params[[true, true, false], "String"]
+  '@Params[[[true, true], [false, false]], "AssociativeArray"]
+  '@Params[[{"test":1}, {"test":1}], "Array"]
+  function assertArrayContainsOnlyValuesOfType_Fail(values, typeName) as void
+
+    assertResult = m.assertArrayContainsOnlyValuesOfType(values, typeName)
+    isFail = m.currentResult.isFail
+
+    isFail = m.currentResult.isFail
+    m.currentResult.Reset()
+
+    m.assertFalse(assertResult)
+    m.assertTrue(isFail)
+
+
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests white spaces work with annotations
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  'some comments to
+  'demonstrate
+  '@Test comments between tests
+  'that we can have comments
+  'between functions and tags
+  function whiteSpacing() as void
+    m.assertTrue(true)
+  end function
+
+  'some comments to
+  'demonstrate
+  '@Test comments between tests with params
+  '@Params[1]
+
+  '@Params[2]
+  'that we can have comments
+  '@Params[3]
+  'between functions and tags
+  '@Params[4]
+
+  function whiteSpacing_params(value) as void
+    m.assertTrue(true)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests AssertNotEmpty
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test pass
+  '@Params[["one", "two", "three"]]
+  '@Params[[1, 2, 3]]
+  '@Params[[true]]
+  '@Params[[[true, true], [false, false]]]
+  '@Params[[{"test":1}]]
+  '@Params["not empty"]
+  '@Params[[invalid]]
+  function assertNotEmpty_Pass(values) as void
+
+    assertResult = m.assertNotEmpty(values)
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertTrue(assertResult)
+    m.assertFalse(isFail)
+
+  end function
+
+  '@Test fail
+  '@Params[invalid]
+  '@Params[[]]
+  '@Params[{}]
+  '@Params[1]
+  '@Params[""]
+  function assertNotEmpty_Fail(values) as void
+
+    assertResult = m.assertNotEmpty(values)
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertFalse(assertResult)
+    m.assertTrue(isFail)
+
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests AssertEmpty
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test pass
+  '@Params[[]]
+  '@Params[{}]
+  '@Params[""]
+  function assertEmpty_Pass(values) as void
+
+    assertResult = m.assertEmpty(values)
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertTrue(assertResult)
+    m.assertFalse(isFail)
+
+  end function
+
+  '@Test fail
+  '@Params[1]
+  '@Params[invalid]
+  '@Params[["one", "two", "three"]]
+  '@Params[[1, 2, 3]]
+  '@Params[[true]]
+  '@Params[[[true, true], [false, false]]]
+  '@Params[[{"test":1}]]
+  '@Params["not empty"]
+  '@Params[[invalid]]
+  function assertEmpty_Fail(values) as void
+
+    assertResult = m.assertEmpty(values)
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertFalse(assertResult)
+    m.assertTrue(isFail)
+
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests expect
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test multi return values
+  function expect_multiValues()
+    obj = {}
+    m.expect(obj, "mockMethod", 5, invalid, { "multiResult": ["one", 2, invalid, "last"] }, true)
+
+    result = obj.mockMethod()
+    m.assertEqual(result, "one")
+
+    result = obj.mockMethod()
+    m.assertEqual(result, 2)
+
+    result = obj.mockMethod()
+    m.assertEqual(result, invalid)
+
+    result = obj.mockMethod()
+    m.assertEqual(result, "last")
+
+    result = obj.mockMethod()
+    m.assertEqual(result, "last")
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertFalse(isFail)
+
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests expect with overloaded expectOnce
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test simple test
+  function expect_multiExpect_success()
+    obj = {}
+    arg1 = "arg1"
+    arg2 = "arg2"
+    arg3 = "arg3"
+    result1 = 1
+    result2 = 2
+    result3 = 3
+
+    m.expectOnce(obj, "mockMethod", [arg1], result1, true)
+    m.expectOnce(obj, "mockMethod", [arg2], result2, true)
+    m.expectOnce(obj, "mockMethod", [arg3], result3, true)
+
+    result = obj.mockMethod(arg1)
+    m.assertEqual(result, result1)
+
+    result = obj.mockMethod(arg2)
+    m.assertEqual(result, result2)
+
+    result = obj.mockMethod(arg3)
+    m.assertEqual(result, result3)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertFalse(isFail)
+  end function
+
+
+  '@Test can set up multi expects on same method - one invocation with any args
+  function expect_multiExpect_success_oneCallsArgsNotTracked()
+    obj = {}
+    arg1 = "arg1"
+    arg2 = "arg2"
+    arg3 = "arg3"
+    result1 = 1
+    result2 = 2
+    result3 = 3
+
+    m.expectOnce(obj, "mockMethod", [arg1], result1, true)
+    m.expectOnce(obj, "mockMethod", invalid, result2, true)
+    m.expectOnce(obj, "mockMethod", [arg3], result3, true)
+
+    result = obj.mockMethod(arg1)
+    m.assertEqual(result, result1)
+
+    result = obj.mockMethod("do not care about args", "used in invocation", 2)
+    m.assertEqual(result, result2)
+
+    result = obj.mockMethod(arg3)
+    m.assertEqual(result, result3)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertFalse(isFail)
+
+  end function
+
+  '@Test can set up multi expects on same method - multi params
+  function expect_multiExpect_multi_args_success()
+    obj = {}
+    arg1 = "arg1"
+    arg2 = "arg2"
+    arg3 = "arg3"
+    result1 = 1
+    result2 = 2
+    result3 = 3
+
+    m.expectOnce(obj, "mockMethod", [arg1, arg2, arg3], result1, true)
+    m.expectOnce(obj, "mockMethod", [arg2, arg3, arg1], result2, true)
+    m.expectOnce(obj, "mockMethod", [arg3, arg2, arg1], result3, true)
+
+    result = obj.mockMethod(arg1, arg2, arg3)
+    m.assertEqual(result, result1)
+
+    result = obj.mockMethod(arg2, arg3, arg1)
+    m.assertEqual(result, result2)
+
+    result = obj.mockMethod(arg3, arg2, arg1)
+    m.assertEqual(result, result3)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertFalse(isFail)
+
+  end function
+
+  '@Test multi test, multi params with other expects
+  function expect_multiExpect_multi_args_others_success()
+    obj = {}
+    arg1 = "arg1"
+    arg2 = "arg2"
+    arg3 = "arg3"
+    result1 = 1
+    result2 = 2
+    result3 = 3
+
+    m.expectOnce(obj, "anotherMockMethod", invalid, "another", true)
+    m.expectOnce(obj, "anotherMockMethod2", [1, 2, 3], "another2", true)
+    m.expectOnce(obj, "mockMethod", [arg1, arg2, arg3], result1, true)
+    m.expectOnce(obj, "mockMethod", [arg2, arg3, arg1], result2, true)
+    m.expectOnce(obj, "mockMethod", [arg3, arg2, arg1], result3, true)
+
+    result = obj.anotherMockMethod()
+    m.assertEqual(result, "another")
+
+    result = obj.anotherMockMethod2(1, 2, 3)
+    m.assertEqual(result, "another2")
+
+    result = obj.mockMethod(arg1, arg2, arg3)
+    m.assertEqual(result, result)
+
+    result = obj.mockMethod(arg2, arg3, arg1)
+    m.assertEqual(result, result2)
+
+    result = obj.mockMethod(arg3, arg2, arg1)
+    m.assertEqual(result, result3)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertFalse(isFail)
+
+  end function
+
+  '@Test multi test, multi params with other expects - fail others
+  function expect_multiExpect_multi_args_others_fail()
+    obj = {}
+    arg1 = "arg1"
+    arg2 = "arg2"
+    arg3 = "arg3"
+    result1 = 1
+    result2 = 2
+    result3 = 3
+
+    m.expectOnce(obj, "anotherMockMethod", ["not passed"], "another", true)
+    m.expectOnce(obj, "anotherMockMethod2", [1, 2, 3], "another2", true)
+    m.expectOnce(obj, "mockMethod", [arg1, arg2, arg3], result1, true)
+    m.expectOnce(obj, "mockMethod", [arg2, arg3, arg1], result2, true)
+    m.expectOnce(obj, "mockMethod", [arg3, arg2, arg1], result3, true)
+
+    result = obj.anotherMockMethod()
+    m.assertEqual(result, "another")
+
+    result = obj.anotherMockMethod2(1, 2, 3)
+    m.assertEqual(result, "another2")
+
+    result = obj.mockMethod(arg1, arg2, arg3)
+    m.assertEqual(result, result)
+
+    result = obj.mockMethod(arg2, arg3, arg1)
+    m.assertEqual(result, result2)
+
+    result = obj.mockMethod(arg3, arg2, arg1)
+    m.assertEqual(result, result3)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertTrue(isFail)
+
+  end function
+
+  '@Test can set up multi expects on same method
+  '@Params["arg1_", "arg2", "arg3"]
+  '@Params["arg1", "arg2", "arg3_"]
+  '@Params["arg1", "arg2_", "arg3"]
+  '@Params["arg1", "arg2_", "arg3"]
+  '@Params["arg1_", "arg2_", "arg3"]
+  '@Params["arg1_", invalid, "arg3"]
+  function expect_multiExpect_fail(call1, call2, call3)
+    obj = {}
+    arg1 = "arg1"
+    arg2 = "arg2"
+    arg3 = "arg3"
+    result1 = 1
+    result2 = 2
+    result3 = 3
+
+    m.expectOnce(obj, "mockMethod", [arg1], result1, true)
+    m.expectOnce(obj, "mockMethod", [arg2], result2, true)
+    m.expectOnce(obj, "mockMethod", [arg3], result3, true)
+
+    result = obj.mockMethod(call1)
+    m.assertEqual(result, result1)
+
+    result = obj.mockMethod(call2)
+    m.assertEqual(result, result2)
+
+    result = obj.mockMethod(call2)
+    m.assertEqual(result, result3)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertTrue(isFail)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests overloaded expectOnce on different objects
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test success
+  function expect_multiExpect_differentOnj_success()
+    obj = {}
+    obj2 = {}
+    arg1 = "arg1"
+    arg2 = "arg2"
+    arg3 = "arg3"
+    result1 = 1
+    result2 = 2
+    result3 = 3
+
+    m.expectOnce(obj, "mockMethod", [arg1], result1, true)
+    m.expectOnce(obj, "mockMethod", [arg2], result2, true)
+    m.expectOnce(obj2, "mockMethod", [arg3], result3, true)
+
+    result = obj.mockMethod(arg1)
+    m.assertEqual(result, result1)
+
+    result = obj.mockMethod(arg2)
+    m.assertEqual(result, result2)
+
+    result = obj2.mockMethod(arg3)
+    m.assertEqual(result, result3)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertFalse(isFail)
+
+  end function
+
+  '@Test fail to match
+  function expect_multiExpect_differentOnj_fail()
+    obj = {}
+    obj2 = {}
+    arg1 = "arg1"
+    arg2 = "arg2"
+    arg3 = "arg3"
+    result1 = 1
+    result2 = 2
+    result3 = 3
+
+    m.expectOnce(obj, "mockMethod", [arg1], result1, true)
+    m.expectOnce(obj, "mockMethod", [arg2], result2, true)
+    m.expectOnce(obj2, "mockMethod", [arg3], result3, true)
+
+    result = obj.mockMethod(arg1)
+    m.assertEqual(result, result1)
+
+    result = obj.mockMethod(arg2)
+    m.assertEqual(result, result2)
+
+    result = obj2.mockMethod(arg3)
+    m.assertEqual(result, result3)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertFalse(isFail)
+
+  end function
+
+  'ASSERTIONS TO WRITE TESTS FOR!
+
+  'This is coming soon!
+
+  '    AssertEqual
+  '    AssertLike
+  '    AssertNotEqual
+  '    AssertInvalid
+  '    AssertNotInvalid
+  '    AssertAAHasKey
+  '    AssertAANotHasKey
+  '    AssertAAHasKeys
+  '    AssertAANotHasKeys
+  '    AssertArrayNotContains
+  '    AssertArrayContainsSubset
+  '    AssertArrayNotContainsSubsetet
+  '    AssertArrayCount
+  '    AssertArrayNotCount
+  '    AssertArrayContainsOnly
+  '    AssertType
+  '    AssertSubType
+  '
+  '    'Node extensions
+  '    AssertNodeCount
+  '    AssertNodeNotCount
+  '    AssertNodeEmpty
+  '    AssertNodeNotEmpty
+  '    AssertNodeContains
+  '    AssertNodeNotContains
+  '    AssertNodeContainsFields
+  '    AssertNodeNotContainsFields
+
+  '    AssertArray
+  '    AssertAAContainsSubset
+  '
+  '    'Mocking and stubbing
+  '    AssertMocks
+  '    MockFail
+end namespace
\ No newline at end of file
diff --git a/frameworkTests/source/tests/BasicTests.bs b/tests/src/source/BasicTests.bs
similarity index 96%
rename from frameworkTests/source/tests/BasicTests.bs
rename to tests/src/source/BasicTests.bs
index 3bdd1eca..7b908204 100644
--- a/frameworkTests/source/tests/BasicTests.bs
+++ b/tests/src/source/BasicTests.bs
@@ -1,5 +1,5 @@
 '@TestSuite [BT] Basic tests
-namespace Rooibos.Tests.BasicTests
+namespace Tests.BasicTests
 
   '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
   '@It tests the node context is available for a Node scope function
@@ -8,7 +8,7 @@ namespace Rooibos.Tests.BasicTests
   '@Test 
   function NodeScope() as void
     m.assertNotInvalid(m.node)
-    Rooibos.Tests.BasicTests.doSomethingInNodeScope(true)
+    Tests.BasicTests.doSomethingInNodeScope(true)
     m.assertInvalid(m._isNodeScopeVarSet)
     m.assertTrue(m.node._isNodeScopeVarSet)
   end function
diff --git a/tests/src/source/CommonTests.bs b/tests/src/source/CommonTests.bs
new file mode 100644
index 00000000..3b25ce99
--- /dev/null
+++ b/tests/src/source/CommonTests.bs
@@ -0,0 +1,27 @@
+'@TestSuite RCMT Common tests
+
+namespace Common
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests EqArray
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test
+  '@Params[invalid, [], false]
+  '@Params[[], invalid, false]
+  '@Params[invalid, invalid, false]
+  '@Params[["one", "three"], [], false]
+  '@Params[[], ["one", "three"], false]
+  '@Params[[], [], true]
+  '@Params[["one", "two", "three"], ["one", "three"], false]
+  '@Params[["one", "two", "three"], ["one", "two", "three"], true]
+  '@Params[[1, 2, 3], ["one", "two", "three"], false]
+  '@Params[[1, 2, 3], [1, 2, 3], true]
+  '@Params[[1, invalid, "3"], [1, invalid, "3"], true]
+  '@Params[[3, 2, 1], [1, 2, 3], false]
+  function eqArray_Pass(values, values2, expected) as void
+
+    result = Common.eqArray(values, values2)
+    m.assertEqual(result, expected)
+  end function
+
+end namespace
\ No newline at end of file
diff --git a/frameworkTests/source/tests/ExpectTests.bs b/tests/src/source/ExpectTests.bs
similarity index 97%
rename from frameworkTests/source/tests/ExpectTests.bs
rename to tests/src/source/ExpectTests.bs
index d7d42a13..5cf797d9 100644
--- a/frameworkTests/source/tests/ExpectTests.bs
+++ b/tests/src/source/ExpectTests.bs
@@ -1,6 +1,6 @@
 '@TestSuite ET ExpectTests
 
-namespace Rooibos.Tests.ExpectTests
+namespace Tests.ExpectTests
 
 '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 '@It tests bug with expectOnce not matching values
diff --git a/frameworkTests/source/tests/MatcherTests.bs b/tests/src/source/MatcherTests.bs
similarity index 99%
rename from frameworkTests/source/tests/MatcherTests.bs
rename to tests/src/source/MatcherTests.bs
index ad0bd65d..5abc50fc 100644
--- a/frameworkTests/source/tests/MatcherTests.bs
+++ b/tests/src/source/MatcherTests.bs
@@ -1,5 +1,5 @@
 '@TestSuite [MT] Matcher Tests
-namespace Rooibos.Tests.MatcherTests
+namespace Tests.MatcherTests
 
   '@BeforeEach
   function beforeEach()
diff --git a/frameworkTests/source/tests/NodeExampleTests.bs b/tests/src/source/NodeExampleTests.bs
similarity index 96%
rename from frameworkTests/source/tests/NodeExampleTests.bs
rename to tests/src/source/NodeExampleTests.bs
index 111671da..820649b5 100644
--- a/frameworkTests/source/tests/NodeExampleTests.bs
+++ b/tests/src/source/NodeExampleTests.bs
@@ -1,6 +1,6 @@
 '@SGNode NodeExampleTests
 '@TestSuite [NET] Node Example Tests
-namespace Rooibos.Tests.NodeExampleTests
+namespace Tests.NodeExampleTests
 
   '@Setup
   function setup() as void
diff --git a/frameworkTests/source/tests/ParamsTests.bs b/tests/src/source/ParamsTests.bs
similarity index 96%
rename from frameworkTests/source/tests/ParamsTests.bs
rename to tests/src/source/ParamsTests.bs
index 8df85fe8..6d18225b 100644
--- a/frameworkTests/source/tests/ParamsTests.bs
+++ b/tests/src/source/ParamsTests.bs
@@ -1,5 +1,5 @@
 '@TestSuite PT ParamsTests
-namespace Rooibos.Tests.ParamsTest
+namespace Tests.ParamsTest
 
   '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
   '@It tests that nodes are created with RBSNode
diff --git a/tests/src/source/VersionTests.bs b/tests/src/source/VersionTests.bs
new file mode 100644
index 00000000..29736392
--- /dev/null
+++ b/tests/src/source/VersionTests.bs
@@ -0,0 +1,27 @@
+import "pkg:/source/rooibos.bs"
+'@TestSuite [VT] Version tests
+
+namespace Tests.VersionTests
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests versionCompare
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test
+  '@Params["0.1", "0.1", 0]
+  '@Params["1.0", "1.0", 0]
+  '@Params["1.0.0", "1.0.0", 0]
+  '@Params["1.0.1", "1.0.1", 0]
+  '@Params["0.1", "0.2", -1]
+  '@Params["1.0", "2.0", -1]
+  '@Params["1.0.0", "2.0.0", -1]
+  '@Params["2.0.0", "2.0.1", -1]
+  '@Params["0.2", "0.1", 1]
+  '@Params["2.0", "1.0", 1]
+  '@Params["2.0.0", "1.0.0", 1]
+  '@Params["2.0.1", "2.0.0", 1]
+  function versionCompare(v1, v2, expected) as void
+    m.assertEqual(rooibos_versionCompare(v1, v2), expected)
+  end function
+
+end namespace
diff --git a/frameworkTests/source/tests/issue_13_afterEach_not_running.bs b/tests/src/source/issue_13_afterEach_not_running.bs
similarity index 96%
rename from frameworkTests/source/tests/issue_13_afterEach_not_running.bs
rename to tests/src/source/issue_13_afterEach_not_running.bs
index 156424a8..92be8699 100644
--- a/frameworkTests/source/tests/issue_13_afterEach_not_running.bs
+++ b/tests/src/source/issue_13_afterEach_not_running.bs
@@ -1,7 +1,7 @@
 '@Ignore - only unignore to test compiler works
 '@TestSuite [DGNT] Duplicate Group Name Tests
 
-namespace Rooibos.Tests.AfterEachNotRunning
+namespace Tests.AfterEachNotRunning
   '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
   '@It group1
   '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/frameworkTests/source/tests/issue_15_tests_only_on_groups.bs b/tests/src/source/issue_15_tests_only_on_groups.bs
similarity index 95%
rename from frameworkTests/source/tests/issue_15_tests_only_on_groups.bs
rename to tests/src/source/issue_15_tests_only_on_groups.bs
index ea096863..1375f8ac 100644
--- a/frameworkTests/source/tests/issue_15_tests_only_on_groups.bs
+++ b/tests/src/source/issue_15_tests_only_on_groups.bs
@@ -1,6 +1,6 @@
 'ADD '@Only ON NEXT LINE TO TEST
 '@TestSuite [RBSA] Rooibos before after tests
-namespace Rooibos.Tests.OnlyOnGroups
+namespace Tests.OnlyOnGroups
   '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
   '@It tests one
   '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/frameworkTests/source/tests/issue_5_duplicateGroupNames.bs b/tests/src/source/issue_5_duplicateGroupNames.bs
similarity index 94%
rename from frameworkTests/source/tests/issue_5_duplicateGroupNames.bs
rename to tests/src/source/issue_5_duplicateGroupNames.bs
index ce06925b..ebed3953 100644
--- a/frameworkTests/source/tests/issue_5_duplicateGroupNames.bs
+++ b/tests/src/source/issue_5_duplicateGroupNames.bs
@@ -1,6 +1,6 @@
 '@Ignore - only unignore to test compiler works - remove REMOVE_THIS to test
 '@TestSuite [RBSA] REMOVE_THIS Rooibos before after tests
-namespace Rooibos.Tests.DuplicateGroupNames
+namespace Tests.DuplicateGroupNames
 
   '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
   '@It tests before each and after each are running
diff --git a/tests/src/source/main.bs b/tests/src/source/main.bs
new file mode 100644
index 00000000..64c03571
--- /dev/null
+++ b/tests/src/source/main.bs
@@ -0,0 +1,37 @@
+sub Main(args as dynamic)
+  ? "Launching with args "
+  ? args
+  m.args = args
+  
+  ' if (type(Rooibos__Init) = "Function") then Rooibos__Init(invalid, invalid, invalid, m)
+  InitScreen()
+end sub
+
+
+function InitScreen() as void
+  'this will be where you setup your typical roku app
+  'it will not be launched when running unit tests
+  screen = CreateObject("roSGScreen")
+  m.port = CreateObject("roMessagePort")
+  screen.setMessagePort(m.port)
+  
+  rootScene = screen.CreateScene("MainScene")
+  rootScene.id = "ROOT"
+  
+  screen.show()
+
+  'do any other stuff here that _must_ be done in main
+  'I'm not a fan of that though; but just showing how it would work
+  rootScene.callFunc("begin", m.args)
+
+  while(true)
+    msg = wait(0, m.port)
+    msgType = type(msg)
+    
+    if msgType = "roSGScreenEvent"
+      if msg.isScreenClosed() 
+        return
+      end if
+    end if
+  end while
+end function
\ No newline at end of file
diff --git a/tests/src/source/rooibos.bs b/tests/src/source/rooibos.bs
new file mode 100644
index 00000000..33dc4f89
--- /dev/null
+++ b/tests/src/source/rooibos.bs
@@ -0,0 +1,13 @@
+import "pkg:/source/roku_modules/rooibos/BaseTestSuite.brs"
+import "pkg:/source/roku_modules/rooibos/CommonUtils.brs"
+import "pkg:/source/roku_modules/rooibos/Coverage.brs"
+import "pkg:/source/roku_modules/rooibos/ItGroup.brs"
+import "pkg:/source/roku_modules/rooibos/Matchers.brs"
+import "pkg:/source/roku_modules/rooibos/NodeMixin.brs"
+import "pkg:/source/roku_modules/rooibos/Rooibos.brs"
+import "pkg:/source/roku_modules/rooibos/RuntimeConfig.brs"
+import "pkg:/source/roku_modules/rooibos/Stats.brs"
+import "pkg:/source/roku_modules/rooibos/TestCase.brs"
+import "pkg:/source/roku_modules/rooibos/TestLogger.brs"
+import "pkg:/source/roku_modules/rooibos/TestRunner.brs"
+import "pkg:/source/roku_modules/rooibos/UnitTestResult.brs"
\ No newline at end of file
diff --git a/frameworkTests/source/tests/testConfig.json b/tests/src/source/testConfig.json
similarity index 100%
rename from frameworkTests/source/tests/testConfig.json
rename to tests/src/source/testConfig.json
diff --git a/frameworkTests/source/tests/testUtils.bs b/tests/src/source/testUtils.bs
similarity index 100%
rename from frameworkTests/source/tests/testUtils.bs
rename to tests/src/source/testUtils.bs
diff --git a/frameworkTests/source/tests/verifyBeforeEachAfterEach.bs b/tests/src/source/verifyBeforeEachAfterEach.bs
similarity index 97%
rename from frameworkTests/source/tests/verifyBeforeEachAfterEach.bs
rename to tests/src/source/verifyBeforeEachAfterEach.bs
index 32b1432c..a89004cb 100644
--- a/frameworkTests/source/tests/verifyBeforeEachAfterEach.bs
+++ b/tests/src/source/verifyBeforeEachAfterEach.bs
@@ -1,5 +1,5 @@
 '@TestSuite [BEAER] BeforeEach and AfterEach Running
-namespace Rooibos.Tests.VeritfyBeforeEachAfterEach
+namespace Tests.VeritfyBeforeEachAfterEach
 
   '@Setup
   function Setup() as void
diff --git a/tests/src/tests/AssertionTests.bs b/tests/src/tests/AssertionTests.bs
new file mode 100644
index 00000000..8635150d
--- /dev/null
+++ b/tests/src/tests/AssertionTests.bs
@@ -0,0 +1,637 @@
+'@TestSuite [RBSA] Rooibos assertion tests
+
+namespace Tests.Assertions
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests basic assertions
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test Fail
+  function fail() as void
+
+    assertResult = m.Fail("reason")
+
+    isFail = m.currentResult.isFail
+    m.currentResult.Reset()
+
+    m.assertFalse(assertResult)
+    m.assertTrue(isFail)
+  end function
+
+  '@Test AssertTrue
+  '@Params[true, true]
+  '@Params[false, false]
+  '@Params[invalid, false]
+  '@Params[0, false]
+  '@Params[1, false]
+  '@Params["test", false]
+  function assertTrue(value, expectedAssertResult) as void
+
+    assertResult = m.assertTrue(value)
+    isFail = m.currentResult.isFail
+    m.currentResult.Reset()
+
+    m.assertEqual(assertResult, expectedAssertResult)
+    m.assertEqual(isFail, not expectedAssertResult)
+  end function
+
+  '@Test AssertFalse
+  '@Params[false, true]
+  '@Params[true, false]
+  '@Params[invalid, false]
+  '@Params[0, false]
+  '@Params[1, false]
+  '@Params["test", false]
+  function assertFalse(value, expectedAssertResult) as void
+
+    assertResult = m.assertFalse(value)
+
+    isFail = m.currentResult.isFail
+    m.currentResult.Reset()
+
+    m.assertEqual(assertResult, expectedAssertResult)
+    m.assertEqual(isFail, not expectedAssertResult)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests AssertArrayContainsAAs
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test Fail
+  '@Params[[{"one":1}], [{"one":2}]]
+  '@Params[[{"one":1}], [{"one":"a"}]]
+  '@Params[[{"one":1}], [{}]]
+  '@Params[[{"one":1}], [invalid]]
+  '@Params[[{"one":1}], []]
+  '@Params[[{"one":1}], invalid]
+  '@Params[[{"one":1}], [[]] ]
+  '@Params[[{"one":1}], ["wrong"] ]
+  '@Params[[{"one":1}], [2] ]
+  '@Params[[{"one":"a"}], [{"one":1}] ]
+  '@Params[[{"two":1}], [{"one":1}] ]
+  '@Params[[invalid], [{"one":1}] ]
+  '@Params[invalid, [{"one":1}] ]
+  '@Params[[{"one":1, "two":2}], [{"one":"1"}] ]
+  '@Params[[{"one":1}, {"two":2}], [{"one":"1"}, {"two":"a"}] ]
+  '@Params[[{"one":1}, {"two":2}], [{"a":1}, {"a":1}, {"a":1}] ]
+  function assertArrayContainsAAs_Fail(expectedAAs, items) as void
+
+    assertResult = m.assertArrayContainsAAs(items, expectedAAs)
+
+    isFail = m.currentResult.isFail
+    m.currentResult.Reset()
+
+    m.assertFalse(assertResult)
+    m.assertTrue(isFail)
+  end function
+
+
+  '@Test pass
+  '@Params[[], []]
+  '@Params[[{}], [{}]]
+  '@Params[[{"one":1}], [{"one":1}]]
+  '@Params[[{"one":1, "two":2}], [{"one":1, "two":2}]]
+  '@Params[[{"one":1, "two":2}], [{ "two":2, "one":1}]]
+  '@Params[[{"one":1, "two":2}, {"one":1}], [{"one":1}, { "two":2, "one":1}]]
+  '@Params[[{"one":1, "two":2}, {"one":1}, {"three":3}], [{"one":1}, {"three":3}, { "two":2, "one":1}]]
+  function assertArrayContainsAAs_Pass(expectedAAs, items) as void
+
+    assertResult = m.assertArrayContainsAAs(items, expectedAAs)
+
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertTrue(assertResult)
+    m.assertFalse(isFail)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests global is present on testSuite
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@BeforeEach
+  function assertGlobal_beforeEach() as void
+    m.beforeEachGlobal = m.global
+  end function
+
+  '@AfterEach
+  function assertGlobal_afterEach() as void
+    m.afterEachGlobal = m.global
+  end function
+
+  '@Test global is in test
+  function assertGlobalIsPassedIntoTest() as void
+    m.assertNotInvalid(m.global)
+  end function
+
+  '@Test global is in before each and after each
+  function assertGlobalIsPassedInto_beforeEach_and_afterEach() as void
+    m.assertNotInvalid(m.global)
+    m.assertNotInvalid(m.beforeEachGlobal)
+    m.assertNotInvalid(m.afterEachGlobal)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests AssertArrayContainsOnlyValuesOfType
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test pass
+  '@Params[["one", "two", "three"], "String"]
+  '@Params[[1, 2, 3], "Integer"]
+  '@Params[[true, true, false], "Boolean"]
+  '@Params[[[true, true], [false, false]], "Array"]
+  '@Params[[{"test":1}, {"test":1}], "AssociativeArray"]
+  function assertArrayContainsOnlyValuesOfType_Pass(values, typeName) as void
+
+    assertResult = m.assertArrayContainsOnlyValuesOfType(values, typeName)
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertTrue(assertResult)
+    m.assertFalse(isFail)
+
+  end function
+
+  '@Test fail
+  '@Params[["one", 2, "three"], "String"]
+  '@Params[[1, "two", 3], "Integer"]
+  '@Params[[true, "true", false], "Boolean"]
+  '@Params[[[true, true], false, false], "Array"]
+  '@Params[[{"test":1}, "notAA"], "AssociativeArray"]
+  '@Params[["one", "two", "three"], "UnknownType"]
+  '@Params[["one", "two", "three"], "Integer"]
+  '@Params[[1, 2, 3], "String"]
+  '@Params[[true, true, false], "String"]
+  '@Params[[[true, true], [false, false]], "AssociativeArray"]
+  '@Params[[{"test":1}, {"test":1}], "Array"]
+  function assertArrayContainsOnlyValuesOfType_Fail(values, typeName) as void
+
+    assertResult = m.assertArrayContainsOnlyValuesOfType(values, typeName)
+    isFail = m.currentResult.isFail
+
+    isFail = m.currentResult.isFail
+    m.currentResult.Reset()
+
+    m.assertFalse(assertResult)
+    m.assertTrue(isFail)
+
+
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests white spaces work with annotations
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  'some comments to
+  'demonstrate
+  '@Test comments between tests
+  'that we can have comments
+  'between functions and tags
+  function whiteSpacing() as void
+    m.assertTrue(true)
+  end function
+
+  'some comments to
+  'demonstrate
+  '@Test comments between tests with params
+  '@Params[1]
+
+  '@Params[2]
+  'that we can have comments
+  '@Params[3]
+  'between functions and tags
+  '@Params[4]
+
+  function whiteSpacing_params(value) as void
+    m.assertTrue(true)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests AssertNotEmpty
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test pass
+  '@Params[["one", "two", "three"]]
+  '@Params[[1, 2, 3]]
+  '@Params[[true]]
+  '@Params[[[true, true], [false, false]]]
+  '@Params[[{"test":1}]]
+  '@Params["not empty"]
+  '@Params[[invalid]]
+  function assertNotEmpty_Pass(values) as void
+
+    assertResult = m.assertNotEmpty(values)
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertTrue(assertResult)
+    m.assertFalse(isFail)
+
+  end function
+
+  '@Test fail
+  '@Params[invalid]
+  '@Params[[]]
+  '@Params[{}]
+  '@Params[1]
+  '@Params[""]
+  function assertNotEmpty_Fail(values) as void
+
+    assertResult = m.assertNotEmpty(values)
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertFalse(assertResult)
+    m.assertTrue(isFail)
+
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests AssertEmpty
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test pass
+  '@Params[[]]
+  '@Params[{}]
+  '@Params[""]
+  function assertEmpty_Pass(values) as void
+
+    assertResult = m.assertEmpty(values)
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertTrue(assertResult)
+    m.assertFalse(isFail)
+
+  end function
+
+  '@Test fail
+  '@Params[1]
+  '@Params[invalid]
+  '@Params[["one", "two", "three"]]
+  '@Params[[1, 2, 3]]
+  '@Params[[true]]
+  '@Params[[[true, true], [false, false]]]
+  '@Params[[{"test":1}]]
+  '@Params["not empty"]
+  '@Params[[invalid]]
+  function assertEmpty_Fail(values) as void
+
+    assertResult = m.assertEmpty(values)
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertFalse(assertResult)
+    m.assertTrue(isFail)
+
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests expect
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test multi return values
+  function expect_multiValues()
+    obj = {}
+    m.expect(obj, "mockMethod", 5, invalid, { "multiResult": ["one", 2, invalid, "last"] }, true)
+
+    result = obj.mockMethod()
+    m.assertEqual(result, "one")
+
+    result = obj.mockMethod()
+    m.assertEqual(result, 2)
+
+    result = obj.mockMethod()
+    m.assertEqual(result, invalid)
+
+    result = obj.mockMethod()
+    m.assertEqual(result, "last")
+
+    result = obj.mockMethod()
+    m.assertEqual(result, "last")
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertFalse(isFail)
+
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests expect with overloaded expectOnce
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test simple test
+  function expect_multiExpect_success()
+    obj = {}
+    arg1 = "arg1"
+    arg2 = "arg2"
+    arg3 = "arg3"
+    result1 = 1
+    result2 = 2
+    result3 = 3
+
+    m.expectOnce(obj, "mockMethod", [arg1], result1, true)
+    m.expectOnce(obj, "mockMethod", [arg2], result2, true)
+    m.expectOnce(obj, "mockMethod", [arg3], result3, true)
+
+    result = obj.mockMethod(arg1)
+    m.assertEqual(result, result1)
+
+    result = obj.mockMethod(arg2)
+    m.assertEqual(result, result2)
+
+    result = obj.mockMethod(arg3)
+    m.assertEqual(result, result3)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertFalse(isFail)
+  end function
+
+
+  '@Test can set up multi expects on same method - one invocation with any args
+  function expect_multiExpect_success_oneCallsArgsNotTracked()
+    obj = {}
+    arg1 = "arg1"
+    arg2 = "arg2"
+    arg3 = "arg3"
+    result1 = 1
+    result2 = 2
+    result3 = 3
+
+    m.expectOnce(obj, "mockMethod", [arg1], result1, true)
+    m.expectOnce(obj, "mockMethod", invalid, result2, true)
+    m.expectOnce(obj, "mockMethod", [arg3], result3, true)
+
+    result = obj.mockMethod(arg1)
+    m.assertEqual(result, result1)
+
+    result = obj.mockMethod("do not care about args", "used in invocation", 2)
+    m.assertEqual(result, result2)
+
+    result = obj.mockMethod(arg3)
+    m.assertEqual(result, result3)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertFalse(isFail)
+
+  end function
+
+  '@Test can set up multi expects on same method - multi params
+  function expect_multiExpect_multi_args_success()
+    obj = {}
+    arg1 = "arg1"
+    arg2 = "arg2"
+    arg3 = "arg3"
+    result1 = 1
+    result2 = 2
+    result3 = 3
+
+    m.expectOnce(obj, "mockMethod", [arg1, arg2, arg3], result1, true)
+    m.expectOnce(obj, "mockMethod", [arg2, arg3, arg1], result2, true)
+    m.expectOnce(obj, "mockMethod", [arg3, arg2, arg1], result3, true)
+
+    result = obj.mockMethod(arg1, arg2, arg3)
+    m.assertEqual(result, result1)
+
+    result = obj.mockMethod(arg2, arg3, arg1)
+    m.assertEqual(result, result2)
+
+    result = obj.mockMethod(arg3, arg2, arg1)
+    m.assertEqual(result, result3)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertFalse(isFail)
+
+  end function
+
+  '@Test multi test, multi params with other expects
+  function expect_multiExpect_multi_args_others_success()
+    obj = {}
+    arg1 = "arg1"
+    arg2 = "arg2"
+    arg3 = "arg3"
+    result1 = 1
+    result2 = 2
+    result3 = 3
+
+    m.expectOnce(obj, "anotherMockMethod", invalid, "another", true)
+    m.expectOnce(obj, "anotherMockMethod2", [1, 2, 3], "another2", true)
+    m.expectOnce(obj, "mockMethod", [arg1, arg2, arg3], result1, true)
+    m.expectOnce(obj, "mockMethod", [arg2, arg3, arg1], result2, true)
+    m.expectOnce(obj, "mockMethod", [arg3, arg2, arg1], result3, true)
+
+    result = obj.anotherMockMethod()
+    m.assertEqual(result, "another")
+
+    result = obj.anotherMockMethod2(1, 2, 3)
+    m.assertEqual(result, "another2")
+
+    result = obj.mockMethod(arg1, arg2, arg3)
+    m.assertEqual(result, result)
+
+    result = obj.mockMethod(arg2, arg3, arg1)
+    m.assertEqual(result, result2)
+
+    result = obj.mockMethod(arg3, arg2, arg1)
+    m.assertEqual(result, result3)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertFalse(isFail)
+
+  end function
+
+  '@Test multi test, multi params with other expects - fail others
+  function expect_multiExpect_multi_args_others_fail()
+    obj = {}
+    arg1 = "arg1"
+    arg2 = "arg2"
+    arg3 = "arg3"
+    result1 = 1
+    result2 = 2
+    result3 = 3
+
+    m.expectOnce(obj, "anotherMockMethod", ["not passed"], "another", true)
+    m.expectOnce(obj, "anotherMockMethod2", [1, 2, 3], "another2", true)
+    m.expectOnce(obj, "mockMethod", [arg1, arg2, arg3], result1, true)
+    m.expectOnce(obj, "mockMethod", [arg2, arg3, arg1], result2, true)
+    m.expectOnce(obj, "mockMethod", [arg3, arg2, arg1], result3, true)
+
+    result = obj.anotherMockMethod()
+    m.assertEqual(result, "another")
+
+    result = obj.anotherMockMethod2(1, 2, 3)
+    m.assertEqual(result, "another2")
+
+    result = obj.mockMethod(arg1, arg2, arg3)
+    m.assertEqual(result, result)
+
+    result = obj.mockMethod(arg2, arg3, arg1)
+    m.assertEqual(result, result2)
+
+    result = obj.mockMethod(arg3, arg2, arg1)
+    m.assertEqual(result, result3)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertTrue(isFail)
+
+  end function
+
+  '@Test can set up multi expects on same method
+  '@Params["arg1_", "arg2", "arg3"]
+  '@Params["arg1", "arg2", "arg3_"]
+  '@Params["arg1", "arg2_", "arg3"]
+  '@Params["arg1", "arg2_", "arg3"]
+  '@Params["arg1_", "arg2_", "arg3"]
+  '@Params["arg1_", invalid, "arg3"]
+  function expect_multiExpect_fail(call1, call2, call3)
+    obj = {}
+    arg1 = "arg1"
+    arg2 = "arg2"
+    arg3 = "arg3"
+    result1 = 1
+    result2 = 2
+    result3 = 3
+
+    m.expectOnce(obj, "mockMethod", [arg1], result1, true)
+    m.expectOnce(obj, "mockMethod", [arg2], result2, true)
+    m.expectOnce(obj, "mockMethod", [arg3], result3, true)
+
+    result = obj.mockMethod(call1)
+    m.assertEqual(result, result1)
+
+    result = obj.mockMethod(call2)
+    m.assertEqual(result, result2)
+
+    result = obj.mockMethod(call2)
+    m.assertEqual(result, result3)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertTrue(isFail)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests overloaded expectOnce on different objects
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test success
+  function expect_multiExpect_differentOnj_success()
+    obj = {}
+    obj2 = {}
+    arg1 = "arg1"
+    arg2 = "arg2"
+    arg3 = "arg3"
+    result1 = 1
+    result2 = 2
+    result3 = 3
+
+    m.expectOnce(obj, "mockMethod", [arg1], result1, true)
+    m.expectOnce(obj, "mockMethod", [arg2], result2, true)
+    m.expectOnce(obj2, "mockMethod", [arg3], result3, true)
+
+    result = obj.mockMethod(arg1)
+    m.assertEqual(result, result1)
+
+    result = obj.mockMethod(arg2)
+    m.assertEqual(result, result2)
+
+    result = obj2.mockMethod(arg3)
+    m.assertEqual(result, result3)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertFalse(isFail)
+
+  end function
+
+  '@Test fail to match
+  function expect_multiExpect_differentOnj_fail()
+    obj = {}
+    obj2 = {}
+    arg1 = "arg1"
+    arg2 = "arg2"
+    arg3 = "arg3"
+    result1 = 1
+    result2 = 2
+    result3 = 3
+
+    m.expectOnce(obj, "mockMethod", [arg1], result1, true)
+    m.expectOnce(obj, "mockMethod", [arg2], result2, true)
+    m.expectOnce(obj2, "mockMethod", [arg3], result3, true)
+
+    result = obj.mockMethod(arg1)
+    m.assertEqual(result, result1)
+
+    result = obj.mockMethod(arg2)
+    m.assertEqual(result, result2)
+
+    result = obj2.mockMethod(arg3)
+    m.assertEqual(result, result3)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertFalse(isFail)
+
+  end function
+
+  'ASSERTIONS TO WRITE TESTS FOR!
+
+  'This is coming soon!
+
+  '    AssertEqual
+  '    AssertLike
+  '    AssertNotEqual
+  '    AssertInvalid
+  '    AssertNotInvalid
+  '    AssertAAHasKey
+  '    AssertAANotHasKey
+  '    AssertAAHasKeys
+  '    AssertAANotHasKeys
+  '    AssertArrayNotContains
+  '    AssertArrayContainsSubset
+  '    AssertArrayNotContainsSubsetet
+  '    AssertArrayCount
+  '    AssertArrayNotCount
+  '    AssertArrayContainsOnly
+  '    AssertType
+  '    AssertSubType
+  '
+  '    'Node extensions
+  '    AssertNodeCount
+  '    AssertNodeNotCount
+  '    AssertNodeEmpty
+  '    AssertNodeNotEmpty
+  '    AssertNodeContains
+  '    AssertNodeNotContains
+  '    AssertNodeContainsFields
+  '    AssertNodeNotContainsFields
+
+  '    AssertArray
+  '    AssertAAContainsSubset
+  '
+  '    'Mocking and stubbing
+  '    AssertMocks
+  '    MockFail
+end namespace
\ No newline at end of file
diff --git a/tests/src/tests/BasicTests.bs b/tests/src/tests/BasicTests.bs
new file mode 100644
index 00000000..7b908204
--- /dev/null
+++ b/tests/src/tests/BasicTests.bs
@@ -0,0 +1,81 @@
+'@TestSuite [BT] Basic tests
+namespace Tests.BasicTests
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests the node context is available for a Node scope function
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test 
+  function NodeScope() as void
+    m.assertNotInvalid(m.node)
+    Tests.BasicTests.doSomethingInNodeScope(true)
+    m.assertInvalid(m._isNodeScopeVarSet)
+    m.assertTrue(m.node._isNodeScopeVarSet)
+  end function
+
+  function doSomethingInNodeScope(value)
+    m._isNodeScopeVarSet = value
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests aa's with a mock will not crash the box!
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test 
+  function EqualsFixForStubbedAAs() as void
+    aa = { "test": "value" }
+    m.expectOnce(aa, "getStubbedObject", [aa])
+
+    aa.getStubbedObject(aa)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests aa's that get printed as failures don't crash box
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test 
+  function PrintResultsFixForStubbedAAs() as void
+    aa = { "test": "value" }
+    bb = { "other": "value" }
+    m.expectOnce(bb, "getStubbedObject", [aa])
+    m.assertEqual(aa, bb)
+    'not crashing on printing the wrong output is a pass
+    m.assertMocks()
+    m.currentResult.Reset()
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It url in params
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test simple
+  '@Params["http://101.rooibos.com"] 
+  function urlParams(url) as void
+    m.assertEqual(url, "http://101.rooibos.com")
+  end function
+
+  '@Test on objects
+  '@Params[{"url":"http://101.rooibos.com", "othervalue":2}] 
+  '@Params[{url:"http://101.rooibos.com", "othervalue":2}] 
+  '@Params[{url:"http://101.rooibos.com", othervalue:2}] 
+  function urlParams_objects(aa) as void
+    m.assertEqual(aa.url, "http://101.rooibos.com")
+    m.assertEqual(aa.othervalue, 2)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests async tests
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test times out
+  function async_timeout()
+    item = { "id": "item" }
+
+    m.assertAsyncField(item, "id")
+    isFail = m.currentResult.isFail
+    m.currentResult.Reset()
+    m.assertTrue(isFail) 
+
+  end function
+
+end namespace
\ No newline at end of file
diff --git a/frameworkTests/source/tests/CommonTests.bs b/tests/src/tests/CommonTests.bs
similarity index 91%
rename from frameworkTests/source/tests/CommonTests.bs
rename to tests/src/tests/CommonTests.bs
index 68c5dbbc..864261cf 100644
--- a/frameworkTests/source/tests/CommonTests.bs
+++ b/tests/src/tests/CommonTests.bs
@@ -1,6 +1,6 @@
 '@TestSuite RCMT Common tests
 
-namespace Rooibos.Common
+namespace Common
   '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
   '@It tests EqArray
   '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -20,7 +20,7 @@ namespace Rooibos.Common
   '@Params[[3, 2, 1], [1, 2, 3], false]
   function eqArray_Pass(values, values2, expected) as void
 
-    result = Rooibos.Common.eqArray(values, values2)
+    result = Common.eqArray(values, values2)
     m.assertEqual(result, expected)
 
   end function
diff --git a/tests/src/tests/ExpectTests.bs b/tests/src/tests/ExpectTests.bs
new file mode 100644
index 00000000..5cf797d9
--- /dev/null
+++ b/tests/src/tests/ExpectTests.bs
@@ -0,0 +1,55 @@
+'@TestSuite ET ExpectTests
+
+namespace Tests.ExpectTests
+
+'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+'@It tests bug with expectOnce not matching values
+'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+'@Test reported case
+'@Params[[52], true]
+'@Params[invalid, false]
+'@Params[[invalid], true]
+'@Params[["42"], true]
+'@Params[[42], false]
+function expectOnce_valuesBug_reported(expectedValue, expectMockFail) as void
+  obj = {
+    foo: function(arg0) : return arg0 : end function
+  }
+  
+  m.ExpectOnce(obj, "foo", expectedValue)
+  obj.foo(42)
+  m.isAutoAssertingMocks = false
+  m.assertMocks()
+  
+  isFail = m.currentResult.isFail
+  m.currentResult.Reset()
+  m.CleanMocks()
+  m.assertEqual(isFail, expectMockFail) 
+end function
+
+
+'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+'@It tests mock count limit
+'+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+'@Test mock count limit at least 25
+function expect_mockCountLimitToBeAtLeast25() as void
+  
+  interface = {}
+  
+  mockCountLimit = 25 
+  for i = 1 to mockCountLimit
+    keyName = StrI(i).trim()
+    interface[keyName] = function(arg0) : return arg0 : end function
+    
+    expectedArg = "a"
+    expectedReturnValue = "b" 
+    m.ExpectOnce(interface, keyName, [expectedArg], [expectedReturnValue])
+    
+    interface[keyName](expectedArg)
+  end for
+  
+end function
+
+end namespace
\ No newline at end of file
diff --git a/tests/src/tests/MatcherTests.bs b/tests/src/tests/MatcherTests.bs
new file mode 100644
index 00000000..5abc50fc
--- /dev/null
+++ b/tests/src/tests/MatcherTests.bs
@@ -0,0 +1,211 @@
+'@TestSuite [MT] Matcher Tests
+namespace Tests.MatcherTests
+
+  '@BeforeEach
+  function beforeEach()
+    'make a mock class
+    m.myClass = {}
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests a custom matcher
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test couple of custom matchers
+  '@Params[true, false, false]
+  '@Params[false, true, true]
+  '@Params[false, false, true]
+  '@Params[true, true, true]
+  function matcher_boolean(v1, v2, expectedFail)
+    returnValue = "notBroken"
+    m.expectOnce(m.myClass, "doWork", [{ "matcher": match_true }, { "matcher": match_false }], returnValue)
+
+    m.assertEqual(m.myClass.doWork(v1, v2), returnValue)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertEqual(isFail, expectedFail)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests a custom inline matcher
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test 
+  '@Params[true, false, false]
+  '@Params[false, true, true]
+  '@Params[false, false, true]
+  '@Params[true, true, true]
+  function inline_matcher_boolean(v1, v2, expectedFail)
+    returnValue = "notBroken"
+    m.expectOnce(m.myClass, "doWork", [{ "matcher": function(value)
+        return value = true
+    end function }, { "matcher": function(value)
+        return value = false
+    end function }], returnValue)
+
+    m.assertEqual(m.myClass.doWork(v1, v2), returnValue)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertEqual(isFail, expectedFail)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '++ built in matchers
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test anyBoolMatcher
+  '@Params[invalid, true]
+  '@Params["false", true]
+  '@Params["true", true]
+  '@Params[23, true]
+  '@Params[{}, true]
+  '@Params[[], true]
+  '@Params[false, false]
+  '@Params[true, false]
+  function matcher_built_in_anyBoolean(v1, expectedFail)
+    returnValue = "notBroken"
+    m.expectOnce(m.myClass, "doWork", [m.anyBoolMatcher], returnValue)
+
+    m.assertEqual(m.myClass.doWork(v1), returnValue)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertEqual(isFail, expectedFail)
+  end function
+
+  '@Test anyStringMatcher
+  '@Params[invalid, true]
+  '@Params["false", false]
+  '@Params["true", false]
+  '@Params[23, true]
+  '@Params[{}, true]
+  '@Params[[], true]
+  '@Params[false, true]
+  '@Params[true, true]
+  function matcher_built_in_anyString(v1, expectedFail)
+    returnValue = "notBroken"
+    m.expectOnce(m.myClass, "doWork", [m.anyStringMatcher], returnValue)
+
+    m.assertEqual(m.myClass.doWork(v1), returnValue)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertEqual(isFail, expectedFail)
+  end function
+
+  '@Test anyNumberMatcher
+  '@Params[invalid, true]
+  '@Params["false", true]
+  '@Params["true", true]
+  '@Params[23, false]
+  '@Params[9, false]
+  '@Params[0, false]
+  '@Params[0.2, false]
+  '@Params[{}, true]
+  '@Params[[], true]
+  '@Params[false, true]
+  '@Params[true, true]
+  function matcher_built_in_anyNumber(v1, expectedFail)
+    returnValue = "notBroken"
+    m.expectOnce(m.myClass, "doWork", [m.anyNumberMatcher], returnValue)
+
+    m.assertEqual(m.myClass.doWork(v1), returnValue)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertEqual(isFail, expectedFail)
+  end function
+
+  '@Test anyAAMatcher
+  '@Params[invalid, true]
+  '@Params["false", true]
+  '@Params["true", true]
+  '@Params[23, true]
+  '@Params[{}, false]
+  '@Params[[], true]
+  '@Params[false, true]
+  '@Params[true, true]
+  function matcher_built_in_anyAA(v1, expectedFail)
+    returnValue = "notBroken"
+    m.expectOnce(m.myClass, "doWork", [m.anyAAMatcher], returnValue)
+
+    m.assertEqual(m.myClass.doWork(v1), returnValue)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertEqual(isFail, expectedFail)
+  end function
+
+  '@Test anyArrayMatcher
+  '@Params[invalid, true]
+  '@Params["false", true]
+  '@Params["true", true]
+  '@Params[23, true]
+  '@Params[{}, true]
+  '@Params[[], false]
+  '@Params[false, true]
+  '@Params[true, true]
+  function matcher_built_in_anyArray(v1, expectedFail)
+    returnValue = "notBroken"
+    m.expectOnce(m.myClass, "doWork", [m.anyArrayMatcher], returnValue)
+
+    m.assertEqual(m.myClass.doWork(v1), returnValue)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertEqual(isFail, expectedFail)
+  end function
+
+  '@Test anyNodeMatcher
+  '@Params[invalid, true]
+  '@Params["false", true]
+  '@Params["true", true]
+  '@Params[23, true]
+  '@Params[{}, true]
+  '@Params["#RBSNode", false]
+  '@Params[[], true]
+  '@Params[false, true]
+  '@Params[true, true]
+  function matcher_built_in_anyNode(v1, expectedFail)
+    returnValue = "notBroken"
+    m.expectOnce(m.myClass, "doWork", [m.anyNodeMatcher], returnValue)
+
+    m.assertEqual(m.myClass.doWork(v1), returnValue)
+
+    m.assertMocks()
+    isFail = m.currentResult.isFail
+
+    m.currentResult.Reset()
+    m.assertEqual(isFail, expectedFail)
+  end function
+
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '++ matchers
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  function match_true(value)
+    return value = true
+  end function
+
+  function match_false(value)
+    return value = false
+  end function
+  
+end namespace
\ No newline at end of file
diff --git a/tests/src/tests/NodeExampleTests.bs b/tests/src/tests/NodeExampleTests.bs
new file mode 100644
index 00000000..820649b5
--- /dev/null
+++ b/tests/src/tests/NodeExampleTests.bs
@@ -0,0 +1,39 @@
+'@SGNode NodeExampleTests
+'@TestSuite [NET] Node Example Tests
+namespace Tests.NodeExampleTests
+
+  '@Setup
+  function setup() as void
+    m.setupThing = "something created during setup"
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests methods present on the node
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@BeforeEach
+  function beforeEach() as void
+    m.beforeEachThing = "something created beforeEach"
+  end function
+
+  '@Test HelloFromNode
+  function helloFromNode_simple() as void
+    'bs:disable-next-line
+    text = HelloFromNode("georgejecook", 12)
+    m.AssertEqual(text, "HELLO georgejecook" + " age:" + stri(12))
+  end function
+
+  '@Test HelloFromNode with params
+  '@Params["jon", 40]
+  '@Params["ringo", 23]
+  '@Params["ringo", 50]
+  '@Params["ringo", 24]
+  '@Params["george", 40]
+  '@Params["paul", 50]
+  function helloFromNode_params(name, age) as void
+    'bs:disable-next-line
+    text = HelloFromNode(name, age)
+    m.AssertEqual(text, "HELLO " + name + " age:" + stri(age))
+  end function
+
+end namespace
diff --git a/tests/src/tests/ParamsTests.bs b/tests/src/tests/ParamsTests.bs
new file mode 100644
index 00000000..6d18225b
--- /dev/null
+++ b/tests/src/tests/ParamsTests.bs
@@ -0,0 +1,35 @@
+'@TestSuite PT ParamsTests
+namespace Tests.ParamsTest
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests that nodes are created with RBSNode
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test
+  '@Params["#RBSNode", "ContentNode"]
+  '@Params["#RBSNode|Group", "Group"]
+  '@Params["#RBSNode|Label", "Label"]
+  function nodeDirective(node, expectedNodeType) as void
+    m.assertSubType(node, expectedNodeType)
+  end function
+
+  '@Test node parsed as other arg index
+  '@Params[1, 2, 3, "#RBSNode", "ContentNode"]
+  '@Params[1, 2, 3, "#RBSNode|Group", "Group"]
+  '@Params[1, 2, 3, "#RBSNode|Label", "Label"]
+  function nodeDirective_otherArgs(arg1, arg2, arg3, node, expectedNodeType) as void
+    m.assertSubType(node, expectedNodeType)
+    m.assertEqual(arg1, 1)
+    m.assertEqual(arg2, 2)
+    m.assertEqual(arg3, 3)
+  end function
+
+  '@Test does not affect regular params
+  '@Params["#someValue", "#someValue"]
+  '@Params[22, 22]
+  '@Params[[1,2,3], [1,2,3]]
+  function nodeDirective_noSideEffect(arg1, expectedValue) as void
+    m.assertEqual(arg1, expectedValue)
+  end function
+
+end namespace
\ No newline at end of file
diff --git a/frameworkTests/source/tests/VersionTests.bs b/tests/src/tests/VersionTests.bs
similarity index 85%
rename from frameworkTests/source/tests/VersionTests.bs
rename to tests/src/tests/VersionTests.bs
index 1c7f1397..9d3ee8f6 100644
--- a/frameworkTests/source/tests/VersionTests.bs
+++ b/tests/src/tests/VersionTests.bs
@@ -1,6 +1,7 @@
+import "pkg:/source/Rooibos.bs"
 '@TestSuite [VT] Version tests
 
-namespace Rooibos.Tests.VersionTests
+namespace Tests.VersionTests
 
   '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
   '@It tests versionCompare
@@ -20,7 +21,7 @@ namespace Rooibos.Tests.VersionTests
   '@Params["2.0.0", "1.0.0", 1]
   '@Params["2.0.1", "2.0.0", 1]
   function versionCompare(v1, v2, expected) as void
-    m.assertEqual(Rooibos.versionCompare(v1, v2), expected)
+    m.assertEqual(versionCompare(v1, v2), expected)
   end function
 
 end namespace
diff --git a/tests/src/tests/issue_13_afterEach_not_running.bs b/tests/src/tests/issue_13_afterEach_not_running.bs
new file mode 100644
index 00000000..92be8699
--- /dev/null
+++ b/tests/src/tests/issue_13_afterEach_not_running.bs
@@ -0,0 +1,51 @@
+'@Ignore - only unignore to test compiler works
+'@TestSuite [DGNT] Duplicate Group Name Tests
+
+namespace Tests.AfterEachNotRunning
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It group1
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test simple
+  function group1_test()
+    m.assertTrue(true)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It group2
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test simple
+  function group2_test()
+    m.assertTrue(true)
+  end function
+
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It group2
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test simple
+  function group2_dupe_test()
+    m.assertTrue(true)
+  end function
+
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It group3
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test simple
+  function group3_test()
+    m.assertTrue(true)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It group1
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test simple
+  function group1_dupe_test()
+    m.assertTrue(true)
+  end function
+end namespace
\ No newline at end of file
diff --git a/tests/src/tests/issue_15_tests_only_on_groups.bs b/tests/src/tests/issue_15_tests_only_on_groups.bs
new file mode 100644
index 00000000..1375f8ac
--- /dev/null
+++ b/tests/src/tests/issue_15_tests_only_on_groups.bs
@@ -0,0 +1,31 @@
+'ADD '@Only ON NEXT LINE TO TEST
+'@TestSuite [RBSA] Rooibos before after tests
+namespace Tests.OnlyOnGroups
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests one
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test it one
+  function it_test_one() as void
+    m.assertTrue(true)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests two
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test it two
+  function it_test_two() as void
+    m.assertTrue(true)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  'ADD '@Only ON NEXT LINE TO TEST
+  '@It tests three
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test it three
+  function it_test_three() as void
+    m.assertTrue(true)
+  end function
+end namespace
\ No newline at end of file
diff --git a/tests/src/tests/issue_5_duplicateGroupNames.bs b/tests/src/tests/issue_5_duplicateGroupNames.bs
new file mode 100644
index 00000000..ebed3953
--- /dev/null
+++ b/tests/src/tests/issue_5_duplicateGroupNames.bs
@@ -0,0 +1,32 @@
+'@Ignore - only unignore to test compiler works - remove REMOVE_THIS to test
+'@TestSuite [RBSA] REMOVE_THIS Rooibos before after tests
+namespace Tests.DuplicateGroupNames
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests before each and after each are running
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@BeforeEach
+  function beforeEach() as void
+    ? "!!! Before"
+  end function
+
+
+  '@AfterEach
+  function afterEach() as void
+    ? "!!! After"
+  end function
+
+  '@Test before after
+  function before_after() as void
+
+    assertResult = m.Fail("reason")
+
+    isFail = m.currentResult.isFail
+    m.currentResult.Reset()
+
+    m.assertFalse(assertResult)
+    m.assertTrue(isFail)
+  end function
+
+end namespace
\ No newline at end of file
diff --git a/outRun/.roku-deploy-staging/source/tests/testConfig.json b/tests/src/tests/testConfig.json
similarity index 100%
rename from outRun/.roku-deploy-staging/source/tests/testConfig.json
rename to tests/src/tests/testConfig.json
diff --git a/outRun/.roku-deploy-staging/source/tests/testUtils.brs b/tests/src/tests/testUtils.bs
similarity index 100%
rename from outRun/.roku-deploy-staging/source/tests/testUtils.brs
rename to tests/src/tests/testUtils.bs
diff --git a/tests/src/tests/verifyBeforeEachAfterEach.bs b/tests/src/tests/verifyBeforeEachAfterEach.bs
new file mode 100644
index 00000000..a89004cb
--- /dev/null
+++ b/tests/src/tests/verifyBeforeEachAfterEach.bs
@@ -0,0 +1,102 @@
+'@TestSuite [BEAER] BeforeEach and AfterEach Running
+namespace Tests.VeritfyBeforeEachAfterEach
+
+  '@Setup
+  function Setup() as void
+    ? "!!! Setup"
+  end function
+
+
+  '@TearDown
+  function TearDown() as void
+    ? "!!! TearDown"
+  end function
+
+  '@BeforeEach
+  function BeforeEach() as void
+    ? "!!! Before"
+  end function
+
+
+  '@AfterEach
+  function AfterEach() as void
+    ? "!!! After"
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests group 1 - should have global before/after 
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test 1 
+  function group1_1() as void
+    m.assertTrue(true)
+  end function
+
+  '@Test 2
+  function group1_2() as void
+    m.assertTrue(true)
+  end function
+
+  '@Test 3
+  '@Params["a"]
+  '@Params["b"]
+  '@Params["c"]
+  function group1_3(values) as void
+    m.assertTrue(true)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests group 2 - should have group before after
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@BeforeEach
+  function group2_BeforeEach() as void
+    ? "!!! Before GROUP 2"
+  end function
+
+
+  '@AfterEach
+  function group2_AfterEach() as void
+    ? "!!! After GROUP 2"
+  end function
+
+  '@Test 1 
+  function group2_1() as void
+    m.assertTrue(true)
+  end function
+
+  '@Test 2
+  function group2_2() as void
+    m.assertTrue(true)
+  end function
+
+  '@Test 3
+  '@Params["a"]
+  '@Params["b"]
+  '@Params["c"]
+  function group2_3(values) as void
+    m.assertTrue(true)
+  end function
+
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  '@It tests group 3 - should have global before/after
+  '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  '@Test 1 
+  function group3_1() as void
+    m.assertTrue(true)
+  end function
+
+  '@Test 2
+  function group3_2() as void
+    m.assertTrue(true)
+  end function
+
+  '@Test 3
+  '@Params["a"]
+  '@Params["b"]
+  '@Params["c"]
+  function group3_3(values) as void
+    m.assertTrue(true)
+  end function
+end namespace
diff --git a/tsconfig.json b/tsconfig.json
deleted file mode 100644
index 1d8745d5..00000000
--- a/tsconfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"compilerOptions": {
-		"outDir": "./dist",
-		"allowJs": true,
-		"target": "es5",
-		"lib": ["esnext"]
-	},
-	"include": [
-		"./src/**/*"
-	]
-}
\ No newline at end of file