diff --git a/android/build.gradle b/android/build.gradle
index 1dfef97f91..3719e548bc 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -66,17 +66,17 @@ ext {
 def baseFolder = new File(HIFI_ANDROID_PRECOMPILED)
 def appDir = new File(projectDir, 'app')
 def jniFolder = new File(appDir, 'src/main/jniLibs/arm64-v8a')
-def baseUrl = 'https://hifi-public.s3.amazonaws.com/austin/android/'
+def baseUrl = ''
 
-def qtFile='qt-5.9.3_linux_armv8-libcpp_openssl.tgz'
+def qtFile='https://hifi-public.s3.amazonaws.com/austin/android/qt-5.9.3_linux_armv8-libcpp_openssl.tgz'
 def qtChecksum='04599670ccca84bd2b15f6915568eb2d'
 def qtVersionId='PeoqzN31n.YvLfs9JE2SgHgZ4.IaKAlt'
 if (Os.isFamily(Os.FAMILY_MAC)) {
-    qtFile = 'qt-5.9.3_osx_armv8-libcpp_openssl.tgz'
+    qtFile = 'https://hifi-public.s3.amazonaws.com/austin/android/qt-5.9.3_osx_armv8-libcpp_openssl.tgz'
     qtChecksum='4b02de9d67d6bfb202355a808d2d9c59'
     qtVersionId='HygCmtMLPYioyil0DfXckGVzhw2SXZA9'
 } else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-    qtFile = 'qt-5.9.3_win_armv8-libcpp_openssl.tgz'
+    qtFile = 'https://hifi-public.s3.amazonaws.com/austin/android/qt-5.9.3_win_armv8-libcpp_openssl.tgz'
     qtChecksum='c3e25db64002d0f43cf565e0ef708911'
     qtVersionId='HeVObSVLCBoc7yY7He1oBMvPIH0VkClT'
 }
@@ -88,58 +88,58 @@ def packages = [
         checksum: qtChecksum,
     ],
     bullet: [
-        file: 'bullet-2.83_armv8-libcpp.tgz',
-        versionId: 'ljb7v.1IjVRqyopUKVDbVnLA4z88J8Eo',
-        checksum: '2c558d604fce337f5eba3eb7ec1252fd',
+        file: 'https://hifi-public.s3.amazonaws.com/dependencies/android/bullet-2.88_armv8-libcpp.tgz',
+        versionId: 'S8YaoED0Cl8sSb8fSV7Q2G1lQJSNDxqg',
+        checksum: '81642779ccb110f8c7338e8739ac38a0',
     ],
     draco: [
-        file: 'draco_armv8-libcpp.tgz',
+        file: 'https://hifi-public.s3.amazonaws.com/austin/android/draco_armv8-libcpp.tgz',
         versionId: 'cA3tVJSmkvb1naA3l6D_Jv2Noh.4yc4m',
         checksum: '617a80d213a5ec69fbfa21a1f2f738cd',
     ],
     glad: [
-        file: 'glad_armv8-libcpp.zip',
+        file: 'https://hifi-public.s3.amazonaws.com/austin/android/glad_armv8-libcpp.zip',
         versionId: 'Q9szthzeye8fFyAA.cY26Lgn2B8kezEE',
         checksum: 'a8ee8584cf1ccd34766c7ddd9d5e5449',
     ],
     glm: [
-        file: 'glm-0.9.8.tgz',
-        versionId: 'BlkJNwaYV2Gfy5XwMeU7K0uzPDRKFMt2',
-        checksum: 'd2b42cee31d2bc17bab6ce69e6b3f30a',
+        file: 'https://hifi-public.s3.amazonaws.com/dependencies/android/glm-0.9.8.5-patched.tgz',
+        versionId: 'cskfMoJrFlAeqI3WPxemyO_Cxt7rT9EJ',
+        checksum: '067b5fe16b220b5b1a1039ba51b062ae',
     ],
     gvr: [
-        file: 'gvrsdk_v1.101.0.tgz',
+        file: 'https://hifi-public.s3.amazonaws.com/austin/android/gvrsdk_v1.101.0.tgz',
         versionId: 'UTberAIFraEfF9IVjoV66u1DTPTopgeY',
         checksum: '57fd02baa069176ba18597a29b6b4fc7',
     ],
     nvtt: [
-        file: 'nvtt_armv8-libcpp.zip',
+        file: 'https://hifi-public.s3.amazonaws.com/austin/android/nvtt_armv8-libcpp.zip',
         versionId: 'vLqrqThvpq4gp75BHMAqO6HhfTXaa0An',
         checksum: 'eb46d0b683e66987190ed124aabf8910',
         sharedLibFolder: 'lib',
         includeLibs: ['libnvtt.so', 'libnvmath.so', 'libnvimage.so', 'libnvcore.so'],
     ],
     openssl: [
-        file: 'openssl-1.1.0g_armv8.tgz',
+        file: 'https://hifi-public.s3.amazonaws.com/austin/android/openssl-1.1.0g_armv8.tgz',
         versionId: 'DmahmSGFS4ltpHyTdyQvv35WOeUOiib9',
         checksum: 'cabb681fbccd79594f65fcc266e02f32',
     ],
     polyvox: [
-        file: 'polyvox_armv8-libcpp.tgz',
+        file: 'https://hifi-public.s3.amazonaws.com/austin/android/polyvox_armv8-libcpp.tgz',
         versionId: 'LDJtzMTvdm4SAc2KYg8Cg6uwWk4Vq3e3',
         checksum: '349ad5b72aaf2749ca95d847e60c5314',
         sharedLibFolder: 'lib',
         includeLibs: ['Release/libPolyVoxCore.so', 'libPolyVoxUtil.so'],
     ],
     tbb: [
-        file: 'tbb-2018_U1_armv8_libcpp.tgz',
+        file: 'https://hifi-public.s3.amazonaws.com/austin/android/tbb-2018_U1_armv8_libcpp.tgz',
         versionId: 'YZliDD8.Menh1IVXKEuLPeO3xAjJ1UdF',
         checksum: '20768f298f53b195e71b414b0ae240c4',
         sharedLibFolder: 'lib/release',
         includeLibs: ['libtbb.so', 'libtbbmalloc.so'],
     ],
     hifiAC: [
-        file: 'libplugins_libhifiCodec.zip',
+        file: 'https://hifi-public.s3.amazonaws.com/austin/android/libplugins_libhifiCodec.zip',
         versionId: 'mzKhsRCgVmloqq5bvE.0IwYK1NjGQc_G',
         checksum: '9412a8e12c88a4096c1fc843bb9fe52d',
         sharedLibFolder: '',
@@ -150,15 +150,15 @@ def packages = [
 
 def scribeLocalFile='scribe' + EXEC_SUFFIX
 
-def scribeFile='scribe_linux_x86_64'
+def scribeFile='https://hifi-public.s3.amazonaws.com/austin/android/scribe_linux_x86_64'
 def scribeChecksum='ca4b904f52f4f993c29175ba96798fa6'
 def scribeVersion='wgpf4dB2Ltzg4Lb2jJ4nPFsHoDkmK_OO'
 if (Os.isFamily(Os.FAMILY_MAC)) {
-    scribeFile = 'scribe_osx_x86_64'
+    scribeFile = 'https://hifi-public.s3.amazonaws.com/austin/android/scribe_osx_x86_64'
     scribeChecksum='72db9d32d4e1e50add755570ac5eb749'
     scribeVersion='o_NbPrktzEYtBkQf3Tn7zc1nZWzM52w6'
 } else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-    scribeFile = 'scribe_win32_x86_64.exe'
+    scribeFile = 'https://hifi-public.s3.amazonaws.com/austin/android/scribe_win32_x86_64.exe'
     scribeChecksum='678e43d290c90fda670c6fefe038a06d'
     scribeVersion='GCCJxlmd2irvNOFWfZR0U1UCLHndHQrC'
 }
@@ -608,4 +608,4 @@ task testElf (dependsOn: 'externalNativeBuildDebug') {
         }
     }
 }
-*/
\ No newline at end of file
+*/
diff --git a/cmake/externals/bullet/CMakeLists.txt b/cmake/externals/bullet/CMakeLists.txt
index 317e3302d9..91860a7470 100644
--- a/cmake/externals/bullet/CMakeLists.txt
+++ b/cmake/externals/bullet/CMakeLists.txt
@@ -17,8 +17,8 @@ include(ExternalProject)
 if (WIN32)
   ExternalProject_Add(
     ${EXTERNAL_NAME}
-    URL http://hifi-public.s3.amazonaws.com/dependencies/bullet-2.83-ccd-and-cmake-fixes.tgz
-    URL_MD5 03051bf112dcc78ddd296f9cab38fd68
+    URL http://hifi-public.s3.amazonaws.com/dependencies/bullet-2.88.tgz
+    URL_MD5 0a6876607ebe83e227427215f15946fd
     CMAKE_ARGS ${PLATFORM_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DBUILD_EXTRAS=0 -DINSTALL_LIBS=1 -DBUILD_BULLET3=0 -DBUILD_OPENGL3_DEMOS=0 -DBUILD_BULLET2_DEMOS=0 -DBUILD_UNIT_TESTS=0 -DUSE_GLUT=0 -DUSE_DX11=0
     LOG_DOWNLOAD 1
     LOG_CONFIGURE 1
@@ -28,8 +28,8 @@ if (WIN32)
 else ()
   ExternalProject_Add(
     ${EXTERNAL_NAME}
-    URL http://hifi-public.s3.amazonaws.com/dependencies/bullet-2.83-ccd-and-cmake-fixes.tgz
-    URL_MD5 03051bf112dcc78ddd296f9cab38fd68
+    URL http://hifi-public.s3.amazonaws.com/dependencies/bullet-2.88.tgz
+    URL_MD5 0a6876607ebe83e227427215f15946fd
     CMAKE_ARGS ${PLATFORM_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DBUILD_EXTRAS=0 -DINSTALL_LIBS=1 -DBUILD_BULLET3=0 -DBUILD_OPENGL3_DEMOS=0 -DBUILD_BULLET2_DEMOS=0 -DBUILD_UNIT_TESTS=0 -DUSE_GLUT=0
     LOG_DOWNLOAD 1
     LOG_CONFIGURE 1
diff --git a/cmake/externals/glm/CMakeLists.txt b/cmake/externals/glm/CMakeLists.txt
index bc8089074f..0a83004438 100644
--- a/cmake/externals/glm/CMakeLists.txt
+++ b/cmake/externals/glm/CMakeLists.txt
@@ -3,8 +3,8 @@ set(EXTERNAL_NAME glm)
 include(ExternalProject)
 ExternalProject_Add(
   ${EXTERNAL_NAME}
-  URL https://hifi-public.s3.amazonaws.com/dependencies/glm-0.9.8.zip
-  URL_MD5 579ac77a3110befa3244d68c0ceb7281
+  URL https://hifi-public.s3.amazonaws.com/dependencies/glm-0.9.8.5-patched.zip
+  URL_MD5 7d39ecc1cea275427534c3cfd6dd63f0
   BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> ${EXTERNAL_ARGS}
   LOG_DOWNLOAD 1
@@ -18,4 +18,4 @@ set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
 ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
 
 string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE PATH "List of glm include directories")
\ No newline at end of file
+set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE PATH "List of glm include directories")
diff --git a/interface/src/Application.h b/interface/src/Application.h
index ee97077002..2bd3df90ca 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -649,7 +649,7 @@ private:
     quint64 _lastFaceTrackerUpdate;
 
     render::ScenePointer _main3DScene{ new render::Scene(glm::vec3(-0.5f * (float)TREE_SCALE), (float)TREE_SCALE) };
-    render::EnginePointer _renderEngine{ new render::Engine() };
+    render::EnginePointer _renderEngine{ new render::RenderEngine() };
     gpu::ContextPointer _gpuContext; // initialized during window creation
 
     mutable QMutex _renderArgsMutex{ QMutex::Recursive };
diff --git a/interface/src/avatar/AvatarMotionState.cpp b/interface/src/avatar/AvatarMotionState.cpp
index beb7e34439..6fc1bd8196 100644
--- a/interface/src/avatar/AvatarMotionState.cpp
+++ b/interface/src/avatar/AvatarMotionState.cpp
@@ -160,7 +160,7 @@ QUuid AvatarMotionState::getSimulatorID() const {
 }
 
 // virtual
-void AvatarMotionState::computeCollisionGroupAndMask(int16_t& group, int16_t& mask) const {
+void AvatarMotionState::computeCollisionGroupAndMask(int32_t& group, int32_t& mask) const {
     group = BULLET_COLLISION_GROUP_OTHER_AVATAR;
     mask = Physics::getDefaultCollisionMask(group);
 }
diff --git a/interface/src/avatar/AvatarMotionState.h b/interface/src/avatar/AvatarMotionState.h
index 73fb853312..2738aba8ee 100644
--- a/interface/src/avatar/AvatarMotionState.h
+++ b/interface/src/avatar/AvatarMotionState.h
@@ -65,7 +65,7 @@ public:
 
     void addDirtyFlags(uint32_t flags) { _dirtyFlags |= flags; }
 
-    virtual void computeCollisionGroupAndMask(int16_t& group, int16_t& mask) const override;
+    virtual void computeCollisionGroupAndMask(int32_t& group, int32_t& mask) const override;
 
     virtual float getMass() const override;
 
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 7bd6b9eab0..620096c29c 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -1402,7 +1402,7 @@ private:
     SharedSoundPointer _collisionSound;
 
     MyCharacterController _characterController;
-    int16_t _previousCollisionGroup { BULLET_COLLISION_GROUP_MY_AVATAR };
+    int32_t _previousCollisionGroup { BULLET_COLLISION_GROUP_MY_AVATAR };
 
     AvatarWeakPointer _lookAtTargetAvatar;
     glm::vec3 _targetAvatarPosition;
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 645c310062..d9365b516f 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -817,7 +817,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
     READ_ENTITY_PROPERTY(PROP_VISIBLE, bool, setVisible);
     READ_ENTITY_PROPERTY(PROP_CAN_CAST_SHADOW, bool, setCanCastShadow);
     READ_ENTITY_PROPERTY(PROP_COLLISIONLESS, bool, setCollisionless);
-    READ_ENTITY_PROPERTY(PROP_COLLISION_MASK, uint8_t, setCollisionMask);
+    READ_ENTITY_PROPERTY(PROP_COLLISION_MASK, uint16_t, setCollisionMask);
     READ_ENTITY_PROPERTY(PROP_DYNAMIC, bool, setDynamic);
     READ_ENTITY_PROPERTY(PROP_LOCKED, bool, setLocked);
     READ_ENTITY_PROPERTY(PROP_USER_DATA, QString, setUserData);
@@ -1849,7 +1849,7 @@ void EntityItem::setCollisionless(bool value) {
     });
 }
 
-void EntityItem::setCollisionMask(uint8_t value) {
+void EntityItem::setCollisionMask(uint16_t value) {
     withWriteLock([&] {
         if ((_collisionMask & ENTITY_COLLISION_MASK_DEFAULT) != (value & ENTITY_COLLISION_MASK_DEFAULT)) {
             _collisionMask = (value & ENTITY_COLLISION_MASK_DEFAULT);
@@ -1914,7 +1914,7 @@ void EntityItem::setCreated(quint64 value) {
     });
 }
 
-void EntityItem::computeCollisionGroupAndFinalMask(int16_t& group, int16_t& mask) const {
+void EntityItem::computeCollisionGroupAndFinalMask(int32_t& group, int32_t& mask) const {
     if (_collisionless) {
         group = BULLET_COLLISION_GROUP_COLLISIONLESS;
         mask = 0;
@@ -1927,7 +1927,7 @@ void EntityItem::computeCollisionGroupAndFinalMask(int16_t& group, int16_t& mask
             group = BULLET_COLLISION_GROUP_STATIC;
         }
 
-        uint8_t userMask = getCollisionMask();
+        uint16_t userMask = getCollisionMask();
 
         if ((bool)(userMask & USER_COLLISION_GROUP_MY_AVATAR) !=
                 (bool)(userMask & USER_COLLISION_GROUP_OTHER_AVATAR)) {
@@ -1941,7 +1941,7 @@ void EntityItem::computeCollisionGroupAndFinalMask(int16_t& group, int16_t& mask
         if ((bool)(_flags & Simulation::SPECIAL_FLAGS_NO_BOOTSTRAPPING)) {
             userMask &= ~USER_COLLISION_GROUP_MY_AVATAR;
         }
-        mask = Physics::getDefaultCollisionMask(group) & (int16_t)(userMask);
+        mask = Physics::getDefaultCollisionMask(group) & (int32_t)(userMask);
     }
 }
 
@@ -2795,8 +2795,8 @@ bool EntityItem::getCollisionless() const {
     return result;
 }
 
-uint8_t EntityItem::getCollisionMask() const {
-    uint8_t result;
+uint16_t EntityItem::getCollisionMask() const {
+    uint16_t result;
     withReadLock([&] {
         result = _collisionMask;
     });
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index edd4dcbd34..bc4767d3db 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -288,10 +288,10 @@ public:
     bool getCollisionless() const;
     void setCollisionless(bool value);
 
-    uint8_t getCollisionMask() const;
-    void setCollisionMask(uint8_t value);
+    uint16_t getCollisionMask() const;
+    void setCollisionMask(uint16_t value);
 
-    void computeCollisionGroupAndFinalMask(int16_t& group, int16_t& mask) const;
+    void computeCollisionGroupAndFinalMask(int32_t& group, int32_t& mask) const;
 
     bool getDynamic() const;
     void setDynamic(bool value);
@@ -580,7 +580,7 @@ protected:
     bool _visible { ENTITY_ITEM_DEFAULT_VISIBLE };
     bool _canCastShadow{ ENTITY_ITEM_DEFAULT_CAN_CAST_SHADOW };
     bool _collisionless { ENTITY_ITEM_DEFAULT_COLLISIONLESS };
-    uint8_t _collisionMask { ENTITY_COLLISION_MASK_DEFAULT };
+    uint16_t _collisionMask { ENTITY_COLLISION_MASK_DEFAULT };
     bool _dynamic { ENTITY_ITEM_DEFAULT_DYNAMIC };
     bool _locked { ENTITY_ITEM_DEFAULT_LOCKED };
     QString _userData { ENTITY_ITEM_DEFAULT_USER_DATA };
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 30e2b13daf..949b39bb7d 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -130,7 +130,7 @@ void buildStringToMaterialMappingModeLookup() {
     addMaterialMappingMode(PROJECTED);
 }
 
-QString getCollisionGroupAsString(uint8_t group) {
+QString getCollisionGroupAsString(uint16_t group) {
     switch (group) {
         case USER_COLLISION_GROUP_DYNAMIC:
             return "dynamic";
@@ -146,7 +146,7 @@ QString getCollisionGroupAsString(uint8_t group) {
     return "";
 }
 
-uint8_t getCollisionGroupAsBitMask(const QStringRef& name) {
+uint16_t getCollisionGroupAsBitMask(const QStringRef& name) {
     if (0 == name.compare(QString("dynamic"))) {
         return USER_COLLISION_GROUP_DYNAMIC;
     } else if (0 == name.compare(QString("static"))) {
@@ -164,7 +164,7 @@ uint8_t getCollisionGroupAsBitMask(const QStringRef& name) {
 QString EntityItemProperties::getCollisionMaskAsString() const {
     QString maskString("");
     for (int i = 0; i < NUM_USER_COLLISION_GROUPS; ++i) {
-        uint8_t group = 0x01 << i;
+        uint16_t group = 0x0001 << i;
         if (group & _collisionMask) {
             maskString.append(getCollisionGroupAsString(group));
             maskString.append(',');
@@ -175,7 +175,7 @@ QString EntityItemProperties::getCollisionMaskAsString() const {
 
 void EntityItemProperties::setCollisionMaskFromString(const QString& maskString) {
     QVector<QStringRef> groups = maskString.splitRef(',');
-    uint8_t mask = 0x00;
+    uint16_t mask = 0x0000;
     for (auto groupName : groups) {
         mask |= getCollisionGroupAsBitMask(groupName);
     }
@@ -1520,7 +1520,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     COPY_PROPERTY_FROM_QSCRIPTVALUE(localRenderAlpha, float, setLocalRenderAlpha);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(collisionless, bool, setCollisionless);
     COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(ignoreForCollisions, bool, setCollisionless, getCollisionless); // legacy support
-    COPY_PROPERTY_FROM_QSCRIPTVALUE(collisionMask, uint8_t, setCollisionMask);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(collisionMask, uint16_t, setCollisionMask);
     COPY_PROPERTY_FROM_QSCRIPTVALUE_ENUM(collidesWith, CollisionMask);
     COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(collisionsWillMove, bool, setDynamic, getDynamic); // legacy support
     COPY_PROPERTY_FROM_QSCRIPTVALUE(dynamic, bool, setDynamic);
@@ -2576,7 +2576,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_VISIBLE, bool, setVisible);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_CAN_CAST_SHADOW, bool, setCanCastShadow);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_COLLISIONLESS, bool, setCollisionless);
-    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_COLLISION_MASK, uint8_t, setCollisionMask);
+    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_COLLISION_MASK, uint16_t, setCollisionMask);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_DYNAMIC, bool, setDynamic);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_LOCKED, bool, setLocked);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_USER_DATA, QString, setUserData);
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index b616b70d68..01c43a46b3 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -148,7 +148,7 @@ public:
     DEFINE_PROPERTY_REF(PROP_ANGULAR_VELOCITY, AngularVelocity, angularVelocity, glm::vec3, ENTITY_ITEM_DEFAULT_ANGULAR_VELOCITY);
     DEFINE_PROPERTY(PROP_ANGULAR_DAMPING, AngularDamping, angularDamping, float, ENTITY_ITEM_DEFAULT_ANGULAR_DAMPING);
     DEFINE_PROPERTY(PROP_COLLISIONLESS, Collisionless, collisionless, bool, ENTITY_ITEM_DEFAULT_COLLISIONLESS);
-    DEFINE_PROPERTY(PROP_COLLISION_MASK, CollisionMask, collisionMask, uint8_t, ENTITY_COLLISION_MASK_DEFAULT);
+    DEFINE_PROPERTY(PROP_COLLISION_MASK, CollisionMask, collisionMask, uint16_t, ENTITY_COLLISION_MASK_DEFAULT);
     DEFINE_PROPERTY(PROP_DYNAMIC, Dynamic, dynamic, bool, ENTITY_ITEM_DEFAULT_DYNAMIC);
     DEFINE_PROPERTY(PROP_IS_SPOTLIGHT, IsSpotlight, isSpotlight, bool, LightEntityItem::DEFAULT_IS_SPOTLIGHT);
     DEFINE_PROPERTY(PROP_INTENSITY, Intensity, intensity, float, LightEntityItem::DEFAULT_INTENSITY);
diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp
index c07c5905f6..b69733c18d 100644
--- a/libraries/networking/src/udt/PacketHeaders.cpp
+++ b/libraries/networking/src/udt/PacketHeaders.cpp
@@ -33,7 +33,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::EntityEdit:
         case PacketType::EntityData:
         case PacketType::EntityPhysics:
-            return static_cast<PacketVersion>(EntityVersion::CloneableData);
+            return static_cast<PacketVersion>(EntityVersion::CollisionMask16Bytes);
         case PacketType::EntityQuery:
             return static_cast<PacketVersion>(EntityQueryPacketVersion::ConicalFrustums);
         case PacketType::AvatarIdentity:
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index 29d4efed42..5203a9d178 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -235,7 +235,8 @@ enum class EntityVersion : PacketVersion {
     MaterialEntities,
     ShadowControl,
     MaterialData,
-    CloneableData
+    CloneableData,
+    CollisionMask16Bytes
 };
 
 enum class EntityScriptCallMethodVersion : PacketVersion {
diff --git a/libraries/physics/src/CharacterController.cpp b/libraries/physics/src/CharacterController.cpp
index 9b6e9fe7a0..64eda975cf 100755
--- a/libraries/physics/src/CharacterController.cpp
+++ b/libraries/physics/src/CharacterController.cpp
@@ -109,7 +109,7 @@ void CharacterController::setDynamicsWorld(btDynamicsWorld* world) {
             }
             _dynamicsWorld = nullptr;
         }
-        int16_t collisionGroup = computeCollisionGroup();
+        int32_t collisionGroup = computeCollisionGroup();
         if (_rigidBody) {
             updateMassProperties();
         }
@@ -325,7 +325,7 @@ void CharacterController::playerStep(btCollisionWorld* collisionWorld, btScalar
     _ghost.setWorldTransform(_rigidBody->getWorldTransform());
 }
 
-void CharacterController::jump() {
+void CharacterController::jump(const btVector3& dir) {
     _pendingFlags |= PENDING_FLAG_JUMP;
 }
 
@@ -352,7 +352,7 @@ static const char* stateToStr(CharacterController::State state) {
 #endif // #ifdef DEBUG_STATE_CHANGE
 
 void CharacterController::updateCurrentGravity() {
-    int16_t collisionGroup = computeCollisionGroup();
+    int32_t collisionGroup = computeCollisionGroup();
     if (_state == State::Hover || collisionGroup == BULLET_COLLISION_GROUP_COLLISIONLESS) {
         _currentGravity = 0.0f;
     } else {
@@ -433,7 +433,7 @@ void CharacterController::setCollisionless(bool collisionless) {
     }
 }
 
-int16_t CharacterController::computeCollisionGroup() const {
+int32_t CharacterController::computeCollisionGroup() const {
     if (_collisionless) {
         return _collisionlessAllowed ? BULLET_COLLISION_GROUP_COLLISIONLESS : BULLET_COLLISION_GROUP_MY_AVATAR;
     } else {
@@ -446,7 +446,7 @@ void CharacterController::handleChangedCollisionGroup() {
         // ATM the easiest way to update collision groups is to remove/re-add the RigidBody
         if (_dynamicsWorld) {
             _dynamicsWorld->removeRigidBody(_rigidBody);
-            int16_t collisionGroup = computeCollisionGroup();
+            int32_t collisionGroup = computeCollisionGroup();
             _dynamicsWorld->addRigidBody(_rigidBody, collisionGroup, BULLET_COLLISION_MASK_MY_AVATAR);
         }
         _pendingFlags &= ~PENDING_FLAG_UPDATE_COLLISION_GROUP;
@@ -538,7 +538,7 @@ void CharacterController::applyMotor(int index, btScalar dt, btVector3& worldVel
     btScalar angle = motor.rotation.getAngle();
     btVector3 velocity = worldVelocity.rotate(axis, -angle);
 
-    int16_t collisionGroup = computeCollisionGroup();
+    int32_t collisionGroup = computeCollisionGroup();
     if (collisionGroup == BULLET_COLLISION_GROUP_COLLISIONLESS ||
             _state == State::Hover || motor.hTimescale == motor.vTimescale) {
         // modify velocity
@@ -679,7 +679,7 @@ void CharacterController::updateState() {
     btVector3 rayStart = _position;
 
     btScalar rayLength = _radius;
-    int16_t collisionGroup = computeCollisionGroup();
+    int32_t collisionGroup = computeCollisionGroup();
     if (collisionGroup == BULLET_COLLISION_GROUP_MY_AVATAR) {
         rayLength += _scaleFactor * DEFAULT_AVATAR_FALL_HEIGHT;
     } else {
diff --git a/libraries/physics/src/CharacterController.h b/libraries/physics/src/CharacterController.h
index 96e479dcad..50db2bea12 100644
--- a/libraries/physics/src/CharacterController.h
+++ b/libraries/physics/src/CharacterController.h
@@ -70,7 +70,7 @@ public:
     virtual void preStep(btCollisionWorld *collisionWorld) override;
     virtual void playerStep(btCollisionWorld *collisionWorld, btScalar dt) override;
     virtual bool canJump() const override { assert(false); return false; } // never call this
-    virtual void jump() override;
+    virtual void jump(const btVector3& dir = btVector3(0.0f, 0.0f, 0.0f)) override;
     virtual bool onGround() const override;
 
     void clearMotors();
@@ -120,7 +120,7 @@ public:
     bool isStuck() const { return _isStuck; }
 
     void setCollisionless(bool collisionless);
-    int16_t computeCollisionGroup() const;
+    int32_t computeCollisionGroup() const;
     void handleChangedCollisionGroup();
 
     bool getRigidBodyLocation(glm::vec3& avatarRigidBodyPosition, glm::quat& avatarRigidBodyRotation);
diff --git a/libraries/physics/src/CharacterGhostObject.cpp b/libraries/physics/src/CharacterGhostObject.cpp
index 331485dd01..a771a52384 100755
--- a/libraries/physics/src/CharacterGhostObject.cpp
+++ b/libraries/physics/src/CharacterGhostObject.cpp
@@ -29,13 +29,13 @@ CharacterGhostObject::~CharacterGhostObject() {
     }
 }
 
-void CharacterGhostObject::setCollisionGroupAndMask(int16_t group, int16_t mask) {
+void CharacterGhostObject::setCollisionGroupAndMask(int32_t group, int32_t mask) {
     _collisionFilterGroup = group;
     _collisionFilterMask = mask;
     // TODO: if this probe is in the world reset ghostObject overlap cache
 }
 
-void CharacterGhostObject::getCollisionGroupAndMask(int16_t& group, int16_t& mask) const {
+void CharacterGhostObject::getCollisionGroupAndMask(int32_t& group, int32_t& mask) const {
     group = _collisionFilterGroup;
     mask = _collisionFilterMask;
 }
diff --git a/libraries/physics/src/CharacterGhostObject.h b/libraries/physics/src/CharacterGhostObject.h
index 1e4625c6f6..44ab5c938a 100755
--- a/libraries/physics/src/CharacterGhostObject.h
+++ b/libraries/physics/src/CharacterGhostObject.h
@@ -28,8 +28,8 @@ public:
     CharacterGhostObject() { }
     ~CharacterGhostObject();
 
-    void setCollisionGroupAndMask(int16_t group, int16_t mask);
-    void getCollisionGroupAndMask(int16_t& group, int16_t& mask) const;
+    void setCollisionGroupAndMask(int32_t group, int32_t mask);
+    void getCollisionGroupAndMask(int32_t& group, int32_t& mask) const;
 
     void setRadiusAndHalfHeight(btScalar radius, btScalar halfHeight);
     void setUpDirection(const btVector3& up);
@@ -54,8 +54,8 @@ protected:
     btScalar _radius { 0.0f };
     btConvexHullShape* _characterShape { nullptr }; // input, shape of character
     CharacterGhostShape* _ghostShape { nullptr }; // internal, shape whose Aabb is used for overlap cache
-    int16_t _collisionFilterGroup { 0 };
-    int16_t _collisionFilterMask { 0 };
+    int32_t _collisionFilterGroup { 0 };
+    int32_t _collisionFilterMask { 0 };
     bool _inWorld { false }; // internal, was added to world
 };
 
diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp
index 7a0ead3e0d..30bbcd1fb8 100644
--- a/libraries/physics/src/EntityMotionState.cpp
+++ b/libraries/physics/src/EntityMotionState.cpp
@@ -779,7 +779,7 @@ QString EntityMotionState::getName() const {
 }
 
 // virtual
-void EntityMotionState::computeCollisionGroupAndMask(int16_t& group, int16_t& mask) const {
+void EntityMotionState::computeCollisionGroupAndMask(int32_t& group, int32_t& mask) const {
     _entity->computeCollisionGroupAndFinalMask(group, mask);
 }
 
diff --git a/libraries/physics/src/EntityMotionState.h b/libraries/physics/src/EntityMotionState.h
index 376cc5afe2..603130b5ff 100644
--- a/libraries/physics/src/EntityMotionState.h
+++ b/libraries/physics/src/EntityMotionState.h
@@ -84,7 +84,7 @@ public:
 
     virtual QString getName() const override;
 
-    virtual void computeCollisionGroupAndMask(int16_t& group, int16_t& mask) const override;
+    virtual void computeCollisionGroupAndMask(int32_t& group, int32_t& mask) const override;
 
     bool shouldSendBid();
     bool isLocallyOwned() const override;
diff --git a/libraries/physics/src/ObjectMotionState.h b/libraries/physics/src/ObjectMotionState.h
index e1cf5a4285..24dd655342 100644
--- a/libraries/physics/src/ObjectMotionState.h
+++ b/libraries/physics/src/ObjectMotionState.h
@@ -154,7 +154,7 @@ public:
 
     virtual QString getName() const { return ""; }
 
-    virtual void computeCollisionGroupAndMask(int16_t& group, int16_t& mask) const = 0;
+    virtual void computeCollisionGroupAndMask(int32_t& group, int32_t& mask) const = 0;
 
     bool isActive() const { return _body ? _body->isActive() : false; }
 
diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp
index 83ffa21a55..9aab27c3e9 100644
--- a/libraries/physics/src/PhysicsEngine.cpp
+++ b/libraries/physics/src/PhysicsEngine.cpp
@@ -148,7 +148,7 @@ void PhysicsEngine::addObjectToDynamicsWorld(ObjectMotionState* motionState) {
     body->setFlags(BT_DISABLE_WORLD_GRAVITY);
     motionState->updateBodyMaterialProperties();
 
-    int16_t group, mask;
+    int32_t group, mask;
     motionState->computeCollisionGroupAndMask(group, mask);
     _dynamicsWorld->addRigidBody(body, group, mask);
 
diff --git a/libraries/render-utils/src/AmbientOcclusionEffect.h b/libraries/render-utils/src/AmbientOcclusionEffect.h
index 3643e608ed..b3a93ab1de 100644
--- a/libraries/render-utils/src/AmbientOcclusionEffect.h
+++ b/libraries/render-utils/src/AmbientOcclusionEffect.h
@@ -181,7 +181,7 @@ class DebugAmbientOcclusionConfig : public render::Job::Config {
     Q_PROPERTY(bool showCursorPixel MEMBER showCursorPixel NOTIFY dirty)
     Q_PROPERTY(glm::vec2 debugCursorTexcoord MEMBER debugCursorTexcoord NOTIFY dirty)
 public:
-    DebugAmbientOcclusionConfig() : render::Job::Config(true) {}
+    DebugAmbientOcclusionConfig() : render::Job::Config(false) {}
 
     bool showCursorPixel{ false };
     glm::vec2 debugCursorTexcoord{ 0.5f, 0.5f };
diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp
index 0d8561ad21..f8f49921a3 100644
--- a/libraries/render-utils/src/GeometryCache.cpp
+++ b/libraries/render-utils/src/GeometryCache.cpp
@@ -122,6 +122,9 @@ static const gpu::Element TEXCOORD4_ELEMENT { gpu::VEC4, gpu::FLOAT, gpu::XYZW }
 static gpu::Stream::FormatPointer SOLID_STREAM_FORMAT;
 static gpu::Stream::FormatPointer INSTANCED_SOLID_STREAM_FORMAT;
 static gpu::Stream::FormatPointer INSTANCED_SOLID_FADE_STREAM_FORMAT;
+static gpu::Stream::FormatPointer WIRE_STREAM_FORMAT;
+static gpu::Stream::FormatPointer INSTANCED_WIRE_STREAM_FORMAT;
+static gpu::Stream::FormatPointer INSTANCED_WIRE_FADE_STREAM_FORMAT;
 
 static const uint SHAPE_VERTEX_STRIDE = sizeof(GeometryCache::ShapeVertex); // position, normal, texcoords, tangent
 static const uint SHAPE_NORMALS_OFFSET = offsetof(GeometryCache::ShapeVertex, normal);
@@ -690,6 +693,38 @@ gpu::Stream::FormatPointer& getInstancedSolidFadeStreamFormat() {
     return INSTANCED_SOLID_FADE_STREAM_FORMAT;
 }
 
+gpu::Stream::FormatPointer& getWireStreamFormat() {
+    if (!WIRE_STREAM_FORMAT) {
+        WIRE_STREAM_FORMAT = std::make_shared<gpu::Stream::Format>(); // 1 for everyone
+        WIRE_STREAM_FORMAT->setAttribute(gpu::Stream::POSITION, gpu::Stream::POSITION, POSITION_ELEMENT);
+        WIRE_STREAM_FORMAT->setAttribute(gpu::Stream::NORMAL, gpu::Stream::NORMAL, NORMAL_ELEMENT);
+    }
+    return WIRE_STREAM_FORMAT;
+}
+
+gpu::Stream::FormatPointer& getInstancedWireStreamFormat() {
+    if (!INSTANCED_WIRE_STREAM_FORMAT) {
+        INSTANCED_WIRE_STREAM_FORMAT = std::make_shared<gpu::Stream::Format>(); // 1 for everyone
+        INSTANCED_WIRE_STREAM_FORMAT->setAttribute(gpu::Stream::POSITION, gpu::Stream::POSITION, POSITION_ELEMENT);
+        INSTANCED_WIRE_STREAM_FORMAT->setAttribute(gpu::Stream::NORMAL, gpu::Stream::NORMAL, NORMAL_ELEMENT);
+        INSTANCED_WIRE_STREAM_FORMAT->setAttribute(gpu::Stream::COLOR, gpu::Stream::COLOR, COLOR_ELEMENT, 0, gpu::Stream::PER_INSTANCE);
+    }
+    return INSTANCED_WIRE_STREAM_FORMAT;
+}
+
+gpu::Stream::FormatPointer& getInstancedWireFadeStreamFormat() {
+    if (!INSTANCED_WIRE_FADE_STREAM_FORMAT) {
+        INSTANCED_WIRE_FADE_STREAM_FORMAT = std::make_shared<gpu::Stream::Format>(); // 1 for everyone
+        INSTANCED_WIRE_FADE_STREAM_FORMAT->setAttribute(gpu::Stream::POSITION, gpu::Stream::POSITION, POSITION_ELEMENT);
+        INSTANCED_WIRE_FADE_STREAM_FORMAT->setAttribute(gpu::Stream::NORMAL, gpu::Stream::NORMAL, NORMAL_ELEMENT);
+        INSTANCED_WIRE_FADE_STREAM_FORMAT->setAttribute(gpu::Stream::COLOR, gpu::Stream::COLOR, COLOR_ELEMENT, 0, gpu::Stream::PER_INSTANCE);
+        INSTANCED_WIRE_FADE_STREAM_FORMAT->setAttribute(gpu::Stream::TEXCOORD2, gpu::Stream::TEXCOORD2, TEXCOORD4_ELEMENT, 0, gpu::Stream::PER_INSTANCE);
+        INSTANCED_WIRE_FADE_STREAM_FORMAT->setAttribute(gpu::Stream::TEXCOORD3, gpu::Stream::TEXCOORD3, TEXCOORD4_ELEMENT, 0, gpu::Stream::PER_INSTANCE);
+        INSTANCED_WIRE_FADE_STREAM_FORMAT->setAttribute(gpu::Stream::TEXCOORD4, gpu::Stream::TEXCOORD4, TEXCOORD4_ELEMENT, 0, gpu::Stream::PER_INSTANCE);
+    }
+    return INSTANCED_WIRE_FADE_STREAM_FORMAT;
+}
+
 QHash<SimpleProgramKey, gpu::PipelinePointer> GeometryCache::_simplePrograms;
 
 gpu::ShaderPointer GeometryCache::_simpleShader;
@@ -827,7 +862,7 @@ void GeometryCache::renderShape(gpu::Batch& batch, Shape shape) {
 }
 
 void GeometryCache::renderWireShape(gpu::Batch& batch, Shape shape) {
-    batch.setInputFormat(getSolidStreamFormat());
+    batch.setInputFormat(getWireStreamFormat());
     _shapes[shape].drawWire(batch);
 }
 
@@ -839,7 +874,7 @@ void GeometryCache::renderShape(gpu::Batch& batch, Shape shape, const glm::vec4&
 }
 
 void GeometryCache::renderWireShape(gpu::Batch& batch, Shape shape, const glm::vec4& color) {
-    batch.setInputFormat(getSolidStreamFormat());
+    batch.setInputFormat(getWireStreamFormat());
     // Color must be set after input format
     batch._glColor4f(color.r, color.g, color.b, color.a);
     _shapes[shape].drawWire(batch);
@@ -857,7 +892,7 @@ void GeometryCache::renderShapeInstances(gpu::Batch& batch, Shape shape, size_t
 }
 
 void GeometryCache::renderWireShapeInstances(gpu::Batch& batch, Shape shape, size_t count, gpu::BufferPointer& colorBuffer) {
-    batch.setInputFormat(getInstancedSolidStreamFormat());
+    batch.setInputFormat(getInstancedWireStreamFormat());
     setupBatchInstance(batch, colorBuffer);
     _shapes[shape].drawWireInstances(batch, count);
 }
@@ -883,7 +918,7 @@ void GeometryCache::renderFadeShapeInstances(gpu::Batch& batch, Shape shape, siz
 
 void GeometryCache::renderWireFadeShapeInstances(gpu::Batch& batch, Shape shape, size_t count, gpu::BufferPointer& colorBuffer,
     gpu::BufferPointer& fadeBuffer1, gpu::BufferPointer& fadeBuffer2, gpu::BufferPointer& fadeBuffer3) {
-    batch.setInputFormat(getInstancedSolidFadeStreamFormat());
+    batch.setInputFormat(getInstancedWireFadeStreamFormat());
     setupBatchFadeInstance(batch, colorBuffer, fadeBuffer1, fadeBuffer2, fadeBuffer3);
     _shapes[shape].drawWireInstances(batch, count);
 }
diff --git a/libraries/render-utils/src/LightClusters.h b/libraries/render-utils/src/LightClusters.h
index f495dabebb..fa054c304a 100644
--- a/libraries/render-utils/src/LightClusters.h
+++ b/libraries/render-utils/src/LightClusters.h
@@ -195,7 +195,7 @@ class DebugLightClustersConfig : public render::Job::Config {
     Q_PROPERTY(bool doDrawClusterFromDepth MEMBER doDrawClusterFromDepth NOTIFY dirty)
     Q_PROPERTY(bool doDrawContent MEMBER doDrawContent NOTIFY dirty)
 public:
-    DebugLightClustersConfig() : render::Job::Config(true){}
+    DebugLightClustersConfig() : render::Job::Config(false){}
 
 
     bool doDrawGrid{ false };
diff --git a/libraries/render-utils/src/SubsurfaceScattering.h b/libraries/render-utils/src/SubsurfaceScattering.h
index 30021fae40..780ce34d7f 100644
--- a/libraries/render-utils/src/SubsurfaceScattering.h
+++ b/libraries/render-utils/src/SubsurfaceScattering.h
@@ -149,7 +149,7 @@ class DebugSubsurfaceScatteringConfig : public render::Job::Config {
     Q_PROPERTY(bool showCursorPixel MEMBER showCursorPixel NOTIFY dirty)
     Q_PROPERTY(glm::vec2 debugCursorTexcoord MEMBER debugCursorTexcoord NOTIFY dirty)
 public:
-    DebugSubsurfaceScatteringConfig() : render::Job::Config(true) {}
+    DebugSubsurfaceScatteringConfig() : render::Job::Config(false) {}
 
     bool showProfile{ false };
     bool showLUT{ false };
diff --git a/libraries/render/src/render/Engine.cpp b/libraries/render/src/render/Engine.cpp
index b0842d63cd..da8e60d40a 100644
--- a/libraries/render/src/render/Engine.cpp
+++ b/libraries/render/src/render/Engine.cpp
@@ -36,12 +36,11 @@ public:
     }
 };
 
-Engine::Engine() : Task(EngineTask::JobModel::create("Engine")),
-    _renderContext(std::make_shared<RenderContext>())
+RenderEngine::RenderEngine() : Engine(EngineTask::JobModel::create("Engine"), std::make_shared<RenderContext>())
 {
 }
 
-void Engine::load() {
+void RenderEngine::load() {
     auto config = getConfiguration();
     const QString configFile= "config/render.json";
 
diff --git a/libraries/render/src/render/Engine.h b/libraries/render/src/render/Engine.h
index 0271c71529..130ed6533f 100644
--- a/libraries/render/src/render/Engine.h
+++ b/libraries/render/src/render/Engine.h
@@ -25,7 +25,7 @@ namespace render {
 
     class RenderContext : public task::JobContext {
     public:
-        RenderContext() : task::JobContext(trace_render()) {}
+        RenderContext() : task::JobContext() {}
         virtual ~RenderContext() {}
 
         RenderArgs* args;
@@ -33,7 +33,9 @@ namespace render {
     };
     using RenderContextPointer = std::shared_ptr<RenderContext>;
 
-    Task_DeclareTypeAliases(RenderContext)
+    Task_DeclareCategoryTimeProfilerClass(RenderTimeProfiler, trace_render);
+
+    Task_DeclareTypeAliases(RenderContext, RenderTimeProfiler)
 
     // Versions of the COnfig integrating a gpu & batch timer
     class GPUJobConfig : public JobConfig {
@@ -57,10 +59,10 @@ namespace render {
 
     class GPUTaskConfig : public TaskConfig {
         Q_OBJECT
-            Q_PROPERTY(double gpuRunTime READ getGPURunTime)
-            Q_PROPERTY(double batchRunTime READ getBatchRunTime)
+        Q_PROPERTY(double gpuRunTime READ getGPURunTime)
+        Q_PROPERTY(double batchRunTime READ getBatchRunTime)
 
-            double _msGPURunTime { 0.0 };
+        double _msGPURunTime { 0.0 };
         double _msBatchRunTime { 0.0 };
     public:
 
@@ -80,32 +82,25 @@ namespace render {
     // The render engine holds all render tasks, and is itself a render task.
     // State flows through tasks to jobs via the render and scene contexts -
     // the engine should not be known from its jobs.
-    class Engine : public Task {
+    class RenderEngine : public Engine {
     public:
 
-        Engine();
-        ~Engine() = default;
+        RenderEngine();
+        ~RenderEngine() = default;
 
         // Load any persisted settings, and set up the presets
         // This should be run after adding all jobs, and before building ui
         void load();
 
         // Register the scene
-        void registerScene(const ScenePointer& scene) { _renderContext->_scene = scene; }
+        void registerScene(const ScenePointer& scene) { _context->_scene = scene; }
 
         // acces the RenderContext
-        RenderContextPointer getRenderContext() const { return _renderContext; }
-
-        // Render a frame
-        // Must have a scene registered and a context set
-        void run() { assert(_renderContext);  Task::run(_renderContext); }
+        RenderContextPointer getRenderContext() const { return _context; }
 
     protected:
-        RenderContextPointer _renderContext;
-
-        void run(const RenderContextPointer& context) override { assert(_renderContext);  Task::run(_renderContext); }
     };
-    using EnginePointer = std::shared_ptr<Engine>;
+    using EnginePointer = std::shared_ptr<RenderEngine>;
 
 }
 
diff --git a/libraries/render/src/render/Item.h b/libraries/render/src/render/Item.h
index e4dcc7ee03..b8a3fbf0f8 100644
--- a/libraries/render/src/render/Item.h
+++ b/libraries/render/src/render/Item.h
@@ -122,6 +122,7 @@ public:
         Builder& withDynamic() { _flags.set(DYNAMIC); return (*this); }
         Builder& withDeformed() { _flags.set(DEFORMED); return (*this); }
         Builder& withInvisible() { _flags.set(INVISIBLE); return (*this); }
+        Builder& withVisible() { _flags.reset(INVISIBLE); return (*this); }
         Builder& withShadowCaster() { _flags.set(SHADOW_CASTER); return (*this); }
         Builder& withLayered() { _flags.set(LAYERED); return (*this); }
         Builder& withMetaCullGroup() { _flags.set(META_CULL_GROUP); return (*this); }
diff --git a/libraries/render/src/render/Scene.h b/libraries/render/src/render/Scene.h
index 2d8bc7f4dd..68acfe8d0f 100644
--- a/libraries/render/src/render/Scene.h
+++ b/libraries/render/src/render/Scene.h
@@ -21,7 +21,7 @@
 
 namespace render {
 
-class Engine;
+class RenderEngine;
 class Scene;
 
 // Transaction is the mechanism to make any change to the scene.
@@ -236,7 +236,7 @@ protected:
     StageMap _stages;
 
 
-    friend class Engine;
+    friend class RenderEngine;
 };
 
 typedef std::shared_ptr<Scene> ScenePointer;
diff --git a/libraries/shared/src/PhysicsCollisionGroups.h b/libraries/shared/src/PhysicsCollisionGroups.h
index edec61dc67..9d99ec3532 100644
--- a/libraries/shared/src/PhysicsCollisionGroups.h
+++ b/libraries/shared/src/PhysicsCollisionGroups.h
@@ -34,13 +34,13 @@ enum CollisionFilterGroups {
  *
 */
 
-const int16_t BULLET_COLLISION_GROUP_STATIC = 1 << 0;
-const int16_t BULLET_COLLISION_GROUP_DYNAMIC = 1 << 1;
-const int16_t BULLET_COLLISION_GROUP_KINEMATIC = 1 << 2;
-const int16_t BULLET_COLLISION_GROUP_MY_AVATAR = 1 << 3;
-const int16_t BULLET_COLLISION_GROUP_OTHER_AVATAR = 1 << 4;
+const int32_t BULLET_COLLISION_GROUP_STATIC = 1 << 0;
+const int32_t BULLET_COLLISION_GROUP_DYNAMIC = 1 << 1;
+const int32_t BULLET_COLLISION_GROUP_KINEMATIC = 1 << 2;
+const int32_t BULLET_COLLISION_GROUP_MY_AVATAR = 1 << 3;
+const int32_t BULLET_COLLISION_GROUP_OTHER_AVATAR = 1 << 4;
 // ...
-const int16_t BULLET_COLLISION_GROUP_COLLISIONLESS = 1 << 14;
+const int32_t BULLET_COLLISION_GROUP_COLLISIONLESS = 1 << 31;
 
 
 /* Note: In order for objectA to collide with objectB at the filter stage
@@ -48,21 +48,21 @@ const int16_t BULLET_COLLISION_GROUP_COLLISIONLESS = 1 << 14;
  */
 
 // the default collision mask is: collides with everything except collisionless
-const int16_t BULLET_COLLISION_MASK_DEFAULT = ~ BULLET_COLLISION_GROUP_COLLISIONLESS;
+const int32_t BULLET_COLLISION_MASK_DEFAULT = ~ BULLET_COLLISION_GROUP_COLLISIONLESS;
 
 // STATIC does not collide with itself (as optimization of physics simulation)
-const int16_t BULLET_COLLISION_MASK_STATIC = ~ (BULLET_COLLISION_GROUP_COLLISIONLESS | BULLET_COLLISION_GROUP_KINEMATIC | BULLET_COLLISION_GROUP_STATIC);
+const int32_t BULLET_COLLISION_MASK_STATIC = ~ (BULLET_COLLISION_GROUP_COLLISIONLESS | BULLET_COLLISION_GROUP_KINEMATIC | BULLET_COLLISION_GROUP_STATIC);
 
-const int16_t BULLET_COLLISION_MASK_DYNAMIC = BULLET_COLLISION_MASK_DEFAULT;
-const int16_t BULLET_COLLISION_MASK_KINEMATIC = BULLET_COLLISION_MASK_STATIC;
+const int32_t BULLET_COLLISION_MASK_DYNAMIC = BULLET_COLLISION_MASK_DEFAULT;
+const int32_t BULLET_COLLISION_MASK_KINEMATIC = BULLET_COLLISION_MASK_STATIC;
 
 // MY_AVATAR does not collide with itself
-const int16_t BULLET_COLLISION_MASK_MY_AVATAR = ~(BULLET_COLLISION_GROUP_COLLISIONLESS | BULLET_COLLISION_GROUP_MY_AVATAR);
+const int32_t BULLET_COLLISION_MASK_MY_AVATAR = ~(BULLET_COLLISION_GROUP_COLLISIONLESS | BULLET_COLLISION_GROUP_MY_AVATAR);
 
-const int16_t BULLET_COLLISION_MASK_OTHER_AVATAR = BULLET_COLLISION_MASK_DEFAULT;
+const int32_t BULLET_COLLISION_MASK_OTHER_AVATAR = BULLET_COLLISION_MASK_DEFAULT;
 
 // COLLISIONLESS gets an empty mask.
-const int16_t BULLET_COLLISION_MASK_COLLISIONLESS = 0;
+const int32_t BULLET_COLLISION_MASK_COLLISIONLESS = 0;
 
 /**jsdoc
  * <p>An entity may collide with the following types of items:</p>
@@ -72,35 +72,35 @@ const int16_t BULLET_COLLISION_MASK_COLLISIONLESS = 0;
  *   </thead>
  *   <tbody>
  *     <tr><td><code>1</code></td><td>Static entities &mdash; non-dynamic entities with no velocity.</td></tr>
- *     <tr><td><code>2</code></td><td>Dynamic entities &mdash; entities that have their <code>dynamic</code> property set to 
+ *     <tr><td><code>2</code></td><td>Dynamic entities &mdash; entities that have their <code>dynamic</code> property set to
  *         <code>true</code>.</td></tr>
  *     <tr><td><code>4</code></td><td>Kinematic entities &mdash; non-dynamic entities with velocity.</td></tr>
  *     <tr><td><code>8</code></td><td>My avatar.</td></tr>
  *     <tr><td><code>16</code></td><td>Other avatars.</td></tr>
  *   </tbody>
  * </table>
- * <p>The values for the collision types that are enabled are added together to give the CollisionMask value. For example, a 
+ * <p>The values for the collision types that are enabled are added together to give the CollisionMask value. For example, a
  * value of <code>31</code> means that an entity will collide with all item types.</p>
  * @typedef {number} Entities.CollisionMask
  */
 
 // The USER collision groups are exposed to script and can be used to generate per-object collision masks.
 // They are not necessarily the same as the BULLET_COLLISION_GROUPS, but we start them off with matching numbers.
-const uint8_t USER_COLLISION_GROUP_STATIC = 1 << 0;
-const uint8_t USER_COLLISION_GROUP_DYNAMIC = 1 << 1;
-const uint8_t USER_COLLISION_GROUP_KINEMATIC = 1 << 2;
-const uint8_t USER_COLLISION_GROUP_MY_AVATAR = 1 << 3;
-const uint8_t USER_COLLISION_GROUP_OTHER_AVATAR = 1 << 4;
+const uint16_t USER_COLLISION_GROUP_STATIC = 1 << 0;
+const uint16_t USER_COLLISION_GROUP_DYNAMIC = 1 << 1;
+const uint16_t USER_COLLISION_GROUP_KINEMATIC = 1 << 2;
+const uint16_t USER_COLLISION_GROUP_MY_AVATAR = 1 << 3;
+const uint16_t USER_COLLISION_GROUP_OTHER_AVATAR = 1 << 4;
 
-const uint8_t ENTITY_COLLISION_MASK_DEFAULT =
+const uint16_t ENTITY_COLLISION_MASK_DEFAULT =
     USER_COLLISION_GROUP_STATIC |
     USER_COLLISION_GROUP_DYNAMIC |
     USER_COLLISION_GROUP_KINEMATIC |
     USER_COLLISION_GROUP_MY_AVATAR |
     USER_COLLISION_GROUP_OTHER_AVATAR;
 
-const uint8_t USER_COLLISION_MASK_AVATARS = USER_COLLISION_GROUP_MY_AVATAR | USER_COLLISION_GROUP_OTHER_AVATAR;
+const uint16_t USER_COLLISION_MASK_AVATARS = USER_COLLISION_GROUP_MY_AVATAR | USER_COLLISION_GROUP_OTHER_AVATAR;
 
-const int NUM_USER_COLLISION_GROUPS = 5;
+const int32_t NUM_USER_COLLISION_GROUPS = 5;
 
 #endif // hifi_PhysicsCollisionGroups_h
diff --git a/libraries/shared/src/PhysicsHelpers.cpp b/libraries/shared/src/PhysicsHelpers.cpp
index 18accfd799..b43d55020e 100644
--- a/libraries/shared/src/PhysicsHelpers.cpp
+++ b/libraries/shared/src/PhysicsHelpers.cpp
@@ -61,7 +61,7 @@ glm::quat computeBulletRotationStep(const glm::vec3& angularVelocity, float time
 }
 /* end Bullet code derivation*/
 
-int16_t Physics::getDefaultCollisionMask(int16_t group) {
+int32_t Physics::getDefaultCollisionMask(int32_t group) {
     switch(group) {
         case  BULLET_COLLISION_GROUP_STATIC:
             return BULLET_COLLISION_MASK_STATIC;
diff --git a/libraries/shared/src/PhysicsHelpers.h b/libraries/shared/src/PhysicsHelpers.h
index 67442187a3..332100f03b 100644
--- a/libraries/shared/src/PhysicsHelpers.h
+++ b/libraries/shared/src/PhysicsHelpers.h
@@ -31,7 +31,7 @@ const float KINEMATIC_ANGULAR_SPEED_THRESHOLD = 0.008f;  // ~0.5 deg/sec
 glm::quat computeBulletRotationStep(const glm::vec3& angularVelocity, float timeStep);
 
 namespace Physics {
-    int16_t getDefaultCollisionMask(int16_t group);
+    int32_t getDefaultCollisionMask(int32_t group);
 
     void setSessionUUID(const QUuid& sessionID);
     const QUuid& getSessionUUID();
diff --git a/libraries/task/src/task/Config.h b/libraries/task/src/task/Config.h
index ceb7e6c245..20de5c850e 100644
--- a/libraries/task/src/task/Config.h
+++ b/libraries/task/src/task/Config.h
@@ -12,6 +12,8 @@
 #ifndef hifi_task_Config_h
 #define hifi_task_Config_h
 
+#include <chrono>
+
 #include <QtCore/qobject.h>
 #include <QtCore/qjsondocument.h>
 #include <QtCore/qjsonobject.h>
@@ -117,11 +119,19 @@ public:
      */
     Q_INVOKABLE void load(const QVariantMap& map) { qObjectFromJsonValue(QJsonObject::fromVariantMap(map), *this); emit loaded(); }
 
+    Q_INVOKABLE QObject* getConfig(const QString& name) { return nullptr; }
+
     // Running Time measurement
     // The new stats signal is emitted once per run time of a job when stats  (cpu runtime) are updated
-    void setCPURunTime(double mstime) { _msCPURunTime = mstime; emit newStats(); }
+    void setCPURunTime(const std::chrono::nanoseconds& runtime) { _msCPURunTime = std::chrono::duration<double, std::milli>(runtime).count(); emit newStats(); }
     double getCPURunTime() const { return _msCPURunTime; }
 
+    // Describe the node graph data connections of the associated Job/Task
+    Q_INVOKABLE virtual bool isTask() const { return false; }
+    Q_INVOKABLE virtual QObjectList getSubConfigs() const { return QObjectList(); }
+    Q_INVOKABLE virtual int getNumSubs() const { return 0; }
+    Q_INVOKABLE virtual QObject* getSubConfig(int i) const { return nullptr; }
+
 public slots:
 
     /**jsdoc
@@ -151,6 +161,8 @@ signals:
     void dirtyEnabled();
 };
 
+using QConfigPointer = std::shared_ptr<JobConfig>;
+
 class TConfigProxy {
 public:
     using Config = JobConfig;
@@ -173,9 +185,10 @@ public:
 
     using Persistent = PersistentConfig<TaskConfig>;
 
-    TaskConfig() = default ;
+    TaskConfig() = default;
     TaskConfig(bool enabled) : JobConfig(enabled) {}
 
+
     /**jsdoc
      * @function Render.getConfig
      * @param {string} name
@@ -212,6 +225,21 @@ public:
         return root->findChild<typename T::Config*>(tokens.front());
     }
 
+    Q_INVOKABLE bool isTask() const override { return true; }
+    Q_INVOKABLE QObjectList getSubConfigs() const override {
+        auto list = findChildren<JobConfig*>(QRegExp(".*"), Qt::FindDirectChildrenOnly);
+        QObjectList returned;
+        for (int i = 0; i < list.size(); i++) {
+            returned.push_back(list[i]);
+        }
+        return returned;
+    }
+    Q_INVOKABLE int getNumSubs() const override { return getSubConfigs().size(); }
+    Q_INVOKABLE QObject* getSubConfig(int i) const override {
+        auto subs = getSubConfigs();
+        return ((i < 0 || i >= subs.size()) ? nullptr : subs[i]);
+    }
+
     void connectChildConfig(QConfigPointer childConfig, const std::string& name);
     void transferChildrenConfigs(QConfigPointer source);
 
@@ -225,8 +253,6 @@ public slots:
     void refresh();
 };
 
-using QConfigPointer = std::shared_ptr<QObject>;
-
 }
 
 #endif // hifi_task_Config_h
diff --git a/libraries/task/src/task/Task.cpp b/libraries/task/src/task/Task.cpp
index 621d77d7bf..9123ef8b04 100644
--- a/libraries/task/src/task/Task.cpp
+++ b/libraries/task/src/task/Task.cpp
@@ -12,9 +12,7 @@
 
 using namespace task;
 
-JobContext::JobContext(const QLoggingCategory& category) :
-    profileCategory(category) {
-    assert(&category);
+JobContext::JobContext() {
 }
 
 JobContext::~JobContext() {
diff --git a/libraries/task/src/task/Task.h b/libraries/task/src/task/Task.h
index 022dd99200..c06ec05121 100644
--- a/libraries/task/src/task/Task.h
+++ b/libraries/task/src/task/Task.h
@@ -15,20 +15,15 @@
 #include "Config.h"
 #include "Varying.h"
 
-#include "SettingHandle.h"
-
-#include <Profile.h>
-#include <PerfStat.h>
-
 namespace task {
 
 class JobConcept;
-template <class JC> class JobT;
-template <class JC> class TaskT;
+template <class JC, class TP> class JobT;
+template <class JC, class TP> class TaskT;
 class JobNoIO {};
 
 // Task Flow control class is a simple per value object used to communicate flow control commands trhough the graph of tasks.
-// From within the Job::Run function, you can access it from the JobCOntext and  issue commands which   will be picked up by the Task calling for the Job run.
+// From within the Job::Run function, you can access it from the JobContext and  issue commands which   will be picked up by the Task calling for the Job run.
 // This is first introduced to provide a way to abort all the work from within a task job. see the "abortTask" call
 class TaskFlow {
 public:
@@ -55,11 +50,10 @@ protected:
 // The JobContext can be derived to add more global state to it that Jobs can access
 class JobContext {
 public:
-    JobContext(const QLoggingCategory& category);
+    JobContext();
     virtual ~JobContext();
 
     std::shared_ptr<JobConfig> jobConfig { nullptr };
-    const QLoggingCategory& profileCategory;
 
     // Task flow control
     TaskFlow taskFlow{};
@@ -80,10 +74,11 @@ public:
 
     virtual const Varying getInput() const { return Varying(); }
     virtual const Varying getOutput() const { return Varying(); }
+    virtual Varying& editInput() = 0;
 
     virtual QConfigPointer& getConfiguration() { return _config; }
     virtual void applyConfiguration() = 0;
-    void setCPURunTime(double mstime) { std::static_pointer_cast<Config>(_config)->setCPURunTime(mstime); }
+    void setCPURunTime(const std::chrono::nanoseconds& runtime) { std::static_pointer_cast<Config>(_config)->setCPURunTime(runtime); }
 
     QConfigPointer _config;
 protected:
@@ -114,10 +109,11 @@ template <class T, class JC, class I, class O> void jobRun(T& data, const JC& jo
     data.run(jobContext, input, output);
 }
 
-template <class JC>
+template <class JC, class TP>
 class Job {
 public:
     using Context = JC;
+    using TimeProfiler = TP;
     using ContextPointer = std::shared_ptr<Context>;
     using Config = JobConfig;
     using None = JobNoIO;
@@ -143,6 +139,7 @@ public:
 
         const Varying getInput() const override { return _input; }
         const Varying getOutput() const override { return _output; }
+        Varying& editInput() override { return _input; }
 
         template <class... A>
         Model(const std::string& name, const Varying& input, QConfigPointer config, A&&... args) :
@@ -160,7 +157,7 @@ public:
 
 
         void applyConfiguration() override {
-            Duration profileRange(trace_render(), ("configure::" + JobConcept::getName()).c_str());
+            TimeProfiler probe(("configure::" + JobConcept::getName()));
 
             jobConfigure(_data, *std::static_pointer_cast<C>(Concept::_config));
         }
@@ -185,6 +182,9 @@ public:
     QConfigPointer& getConfiguration() const { return _concept->getConfiguration(); }
     void applyConfiguration() { return _concept->applyConfiguration(); }
 
+    template <class I> void feedInput(const I& in) { _concept->editInput().template edit<I>() = in; }
+    template <class I, class S> void feedInput(int index, const S& inS) { (_concept->editInput().template editN<I>(index)).template edit<S>() = inS; }
+
     template <class T> T& edit() {
         auto concept = std::static_pointer_cast<typename T::JobModel>(_concept);
         assert(concept);
@@ -198,14 +198,10 @@ public:
     }
 
     virtual void run(const ContextPointer& jobContext) {
-        PerformanceTimer perfTimer(getName().c_str());
-        // NOTE: rather than use the PROFILE_RANGE macro, we create a Duration manually
-        Duration profileRange(jobContext->profileCategory, ("run::" + getName()).c_str());
-        auto start = usecTimestampNow();
-
+        TimeProfiler probe(getName());
+        auto startTime = std::chrono::high_resolution_clock::now();
         _concept->run(jobContext);
-
-        _concept->setCPURunTime((double)(usecTimestampNow() - start) / 1000.0);
+        _concept->setCPURunTime((std::chrono::high_resolution_clock::now() - startTime));
     }
 
 protected:
@@ -220,13 +216,14 @@ protected:
 // The build method is where child Jobs can be added internally to the task
 // where the input of the task can be setup to feed the child jobs
 // and where the output of the task is defined
-template <class JC>
-class Task : public Job<JC> {
+template <class JC, class TP>
+class Task : public Job<JC, TP> {
 public:
     using Context = JC;
+    using TimeProfiler = TP;
     using ContextPointer = std::shared_ptr<Context>;
     using Config = TaskConfig;
-    using JobType = Job<JC>;
+    using JobType = Job<JC, TP>;
     using None = typename JobType::None;
     using Concept = typename JobType::Concept;
     using ConceptPointer = typename JobType::ConceptPointer;
@@ -242,6 +239,8 @@ public:
 
         const Varying getInput() const override { return _input; }
         const Varying getOutput() const override { return _output; }
+        Varying& editInput() override { return _input; }
+
         typename Jobs::iterator editJob(std::string name) {
             typename Jobs::iterator jobIt;
             for (jobIt = _jobs.begin(); jobIt != _jobs.end(); ++jobIt) {
@@ -295,7 +294,7 @@ public:
             auto model = std::make_shared<TaskModel>(name, input, std::make_shared<C>());
 
             {
-                Duration profileRange(trace_render(), ("build::" + model->getName()).c_str());
+                TimeProfiler probe("build::" + model->getName());
                 model->_data.build(*(model), model->_input, model->_output, std::forward<A>(args)...);
             }
             // Recreate the Config to use the templated type
@@ -330,7 +329,7 @@ public:
         }
 
         void applyConfiguration() override {
-            Duration profileRange(trace_render(), ("configure::" + JobConcept::getName()).c_str());
+            TimeProfiler probe("configure::" + JobConcept::getName());
             jobConfigure(_data, *std::static_pointer_cast<C>(Concept::_config));
             for (auto& job : TaskConcept::_jobs) {
                 job.applyConfiguration();
@@ -370,15 +369,44 @@ public:
 
 protected:
 };
+
+template <class JC, class TP>
+class Engine : public Task<JC, TP> {
+public:
+    using Context = JC;
+    using ContextPointer = std::shared_ptr<Context>;
+    using Config = TaskConfig;
+    using TaskType = Task<JC, TP>;
+    using ConceptPointer = typename TaskType::ConceptPointer;
+
+    Engine(const ConceptPointer& concept, const ContextPointer& context) : TaskType(concept), _context(context) {}
+    ~Engine() = default;
+
+    void reset(const ContextPointer& context) { _context = context; }
+
+    void run() {
+        if (_context) {
+            run(_context);
+        }
+    }
+
+protected:
+    void run(const ContextPointer& jobContext) override {
+        TaskType::run(_context);
+    }
+
+    ContextPointer _context;
+};
+
 }
 
-
-#define Task_DeclareTypeAliases(ContextType) \
+#define Task_DeclareTypeAliases(ContextType, TimeProfiler) \
     using JobConfig = task::JobConfig; \
     using TaskConfig = task::TaskConfig; \
     template <class T> using PersistentConfig = task::PersistentConfig<T>; \
-    using Job = task::Job<ContextType>; \
-    using Task = task::Task<ContextType>; \
+    using Job = task::Job<ContextType, TimeProfiler>; \
+    using Task = task::Task<ContextType, TimeProfiler>; \
+    using Engine = task::Engine<ContextType, TimeProfiler>; \
     using Varying = task::Varying; \
     template < typename T0, typename T1 > using VaryingSet2 = task::VaryingSet2<T0, T1>; \
     template < typename T0, typename T1, typename T2 > using VaryingSet3 = task::VaryingSet3<T0, T1, T2>; \
@@ -389,4 +417,16 @@ protected:
     template < typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7 > using VaryingSet8 = task::VaryingSet8<T0, T1, T2, T3, T4, T5, T6, T7>; \
     template < class T, int NUM > using VaryingArray = task::VaryingArray<T, NUM>;
 
+
+
+#include <Profile.h>
+#include <PerfStat.h>
+
+#define Task_DeclareCategoryTimeProfilerClass(className, category) \
+    class className : public PerformanceTimer { \
+    public: \
+        className(const std::string& label) : PerformanceTimer(label.c_str()), profileRange(category(), label.c_str()) {} \
+        Duration profileRange; \
+    };
+
 #endif // hifi_task_Task_h
diff --git a/scripts/developer/utilities/lib/jet/jet.js b/scripts/developer/utilities/lib/jet/jet.js
new file mode 100644
index 0000000000..16840e59bd
--- /dev/null
+++ b/scripts/developer/utilities/lib/jet/jet.js
@@ -0,0 +1,82 @@
+//
+//  Job Engine & Task...
+//  jet.js
+//
+//  Created by Sam Gateau, 2018/03/28
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+"use strict";
+
+ // traverse task tree
+function task_traverse(root, functor, depth) {
+    if (root.isTask()) { 
+        depth++;
+        for (var i = 0; i <root.getNumSubs(); i++) {
+            var sub = root.getSubConfig(i);
+            if (functor(sub, depth, i)) {
+                task_traverse(sub, functor, depth, 0)
+            }
+        }
+    }    
+}
+function task_traverseTree(root, functor) {
+    if (functor(root, 0, 0)) {
+        task_traverse(root, functor, 0)
+    }   
+}
+
+// Access job properties
+// return all the properties of a job
+function job_propKeys(job) {
+    var keys = Object.keys(job)
+    var propKeys = [];
+    for (var k=0; k < keys.length;k++) {
+        // Filter for relevant property
+        var key = keys[k]
+        if ((typeof job[key]) !== "function") {
+            if ((key !== "objectName") && (key !== "cpuRunTime") && (key !== "enabled")) {
+                propKeys.push(keys[k]);
+            }
+        }
+    }   
+    return propKeys; 
+}
+
+// Use this function to create a functor that will fill the specifed array with one entry name per task and job and it s rank
+function job_list_functor(jobList, maxDepth) {
+    if (maxDepth === undefined) maxDepth = 100
+    return function (job, depth, index) {
+        jobList.push(job.objectName);
+        return depth < maxDepth;
+    }
+} 
+
+// Use this function to create a functor that will print the content of the Job visited calling the  specified 'printout' function
+function job_print_functor(printout, showProps, maxDepth) {
+    if (maxDepth === undefined) maxDepth = 100
+    return function (job, depth, index) {
+        var tab = "    "
+        var depthTab = "";
+        for (var d = 0; d < depth; d++) { depthTab += tab }
+        printout(depthTab + index + " " + job.objectName + " " + (job.enabled ? "on " : "off ") + job.cpuRunTime + "ms") 
+        if (showProps) {
+            var keys = job_propKeys(job);
+            for (var p=0; p < keys.length;p++) {
+                var prop = job[keys[p]]
+                printout(depthTab + tab + tab + typeof prop + " " + keys[p] + " " + prop);
+            }
+        }
+        return depth < maxDepth;
+    }
+} 
+
+// Expose functions for regular js including this files through the 'Jet' object
+/*Jet = {}
+Jet.task_traverse = task_traverse
+Jet.task_traverseTree = task_traverseTree
+Jet.job_propKeys = job_propKeys
+Jet.job_print_functor = job_print_functor
+*/
\ No newline at end of file
diff --git a/scripts/developer/utilities/lib/jet/qml/TaskList.qml b/scripts/developer/utilities/lib/jet/qml/TaskList.qml
new file mode 100644
index 0000000000..b801b9171d
--- /dev/null
+++ b/scripts/developer/utilities/lib/jet/qml/TaskList.qml
@@ -0,0 +1,45 @@
+//
+//  jet/TaskList.qml
+//
+//  Created by Sam Gateau, 2018/03/28
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.7
+import QtQuick.Controls 1.4 as Original
+import QtQuick.Controls.Styles 1.4
+
+import "qrc:///qml/styles-uit"
+import "qrc:///qml/controls-uit" as HifiControls
+
+import "../jet.js" as Jet
+
+Rectangle {   
+    HifiConstants { id: hifi;}
+    color: hifi.colors.baseGray;
+    id: root
+ //   width: parent ? parent.width : 200
+ //   height: parent ? parent.height : 400
+    property var rootConfig : Workload
+
+    Original.TextArea {
+        id: textArea
+        width: parent.width
+        height: parent.height
+        text: ""
+    }
+
+    Component.onCompleted: {
+        var message = ""
+        var functor = Jet.job_print_functor(function (line) { message += line + "\n"; }, false);
+        Jet.task_traverseTree(rootConfig, functor);
+        textArea.append(message);
+    }
+
+    function clearWindow() {
+        textArea.remove(0,textArea.length);
+    }
+}
\ No newline at end of file
diff --git a/scripts/developer/utilities/lib/jet/qml/TaskListView.qml b/scripts/developer/utilities/lib/jet/qml/TaskListView.qml
new file mode 100644
index 0000000000..2c75865698
--- /dev/null
+++ b/scripts/developer/utilities/lib/jet/qml/TaskListView.qml
@@ -0,0 +1,119 @@
+//
+//  jet/TaskListView.qml
+//
+//  Created by Sam Gateau, 2018/05/09
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.7
+import QtQuick.Controls 1.4 as Original
+import QtQuick.Controls.Styles 1.4
+
+import "qrc:///qml/styles-uit"
+import "qrc:///qml/controls-uit" as HifiControls
+
+import "../jet.js" as Jet
+
+Rectangle {
+    HifiConstants { id: hifi;}
+    color: hifi.colors.baseGray;
+    id: root;
+    
+    property var rootConfig : Workload
+    property var myArray : []
+
+    Component.onCompleted: {
+        var message = ""
+        var maxDepth = 3;
+        
+        var jobTreePath = []
+        var jobsRoot;
+
+        var functor = function (job, depth, index) {
+            var newItem = {"name": job.objectName, "level": depth, "index": index, "subNode": [], "init": depth < maxDepth, "path": ""}
+            if (depth == 0) {
+                jobsModel.append(newItem)
+                jobsRoot = jobsModel.get(0).subNode;
+            } else {
+                if (jobTreePath.length < depth) {
+                    var node = jobsRoot;
+                    var path;
+                    for (var n = 0; n < jobTreePath.length; n++) {
+                        newItem.path += (n > 0 ? "." : "") + node.get(jobTreePath[n]).name
+                        node = node.get(jobTreePath[n]).subNode
+                    }
+                    node.append(newItem)
+                    jobTreePath.push(0);
+                } else if (jobTreePath.length >= depth) {
+                    var node = jobsRoot;
+                    for (var n = 0; n < (depth - 1); n++) {
+                        newItem.path += (n > 0 ? "." : "") + node.get(jobTreePath[n]).name
+                        node = node.get(jobTreePath[n]).subNode
+                    }
+                    node.append(newItem)
+                    jobTreePath[depth-1] = index;
+                    while (jobTreePath.length > depth) {
+                        jobTreePath.pop();
+                    }                       
+                }
+            }
+            return true;
+        }
+
+        Jet.task_traverseTree(rootConfig, functor);
+    }
+
+    
+    ListModel {
+        id: jobsModel
+    }
+
+    Component {
+        id: objRecursiveDelegate
+        Column {
+            id: objRecursiveColumn
+            clip: true
+            visible: model.init
+            
+            MouseArea {
+                width: objRow.implicitWidth
+                height: objRow.implicitHeight 
+                onDoubleClicked: {
+                    for(var i = 1; i < parent.children.length - 1; ++i) {
+                        parent.children[i].visible = !parent.children[i].visible
+                    }
+                }
+                Row {
+                    id: objRow
+                    Item {
+                        height: 1
+                        width: model.level * 15
+                    }
+                    HifiControls.CheckBox {
+                        property var config: root.rootConfig.getConfig(model.path + "." + model.name);
+                        text: (objRecursiveColumn.children.length > 2 ?
+                                objRecursiveColumn.children[1].visible ?
+                                qsTr("-  ") : qsTr("+ ") : qsTr("   ")) + model.name + " ms=" + config.cpuRunTime.toFixed(2)
+                        checked: config.enabled
+                    }
+                }
+            }
+            Repeater {
+                model: subNode
+                delegate: objRecursiveDelegate
+            }
+        }
+    }
+
+    Original.ScrollView {
+        anchors.fill: parent 
+        ListView {
+            id: theView
+            model: jobsModel
+            delegate: objRecursiveDelegate
+        }
+    }
+}
\ No newline at end of file
diff --git a/scripts/developer/utilities/lib/jet/qml/qmldir b/scripts/developer/utilities/lib/jet/qml/qmldir
new file mode 100644
index 0000000000..3134545625
--- /dev/null
+++ b/scripts/developer/utilities/lib/jet/qml/qmldir
@@ -0,0 +1,2 @@
+TaskList  1.0 TaskList.qml
+TaskViewList  1.0 TaskViewList.qml
\ No newline at end of file
diff --git a/scripts/developer/utilities/render/configSlider/ConfigSlider.qml b/scripts/developer/utilities/render/configSlider/ConfigSlider.qml
index 87e0e51726..41de77fb09 100644
--- a/scripts/developer/utilities/render/configSlider/ConfigSlider.qml
+++ b/scripts/developer/utilities/render/configSlider/ConfigSlider.qml
@@ -23,13 +23,22 @@ Item {
     anchors.left: parent.left
     anchors.right: parent.right    
     height: 24
+
+    property var labelAreaWidthScale: 0.5
+
     property bool integral: false
     property var config
     property string property
-    property alias label: labelControl.text
     property alias min: sliderControl.minimumValue
     property alias max: sliderControl.maximumValue
 
+    property alias label: labelControl.text
+    property bool showLabel: true  
+
+    property bool showValue: true  
+
+    
+       
     signal valueChanged(real value)
 
     Component.onCompleted: {
@@ -41,20 +50,12 @@ Item {
     HifiControls.Label {
         id: labelControl
         text: root.label
-        enabled: true
+        enabled: root.showLabel
         anchors.left: root.left
-        anchors.right: root.horizontalCenter
+        width: root.width * root.labelAreaWidthScale
         anchors.verticalCenter: root.verticalCenter
     }
-
-    HifiControls.Label {
-        id: labelValue
-        text: sliderControl.value.toFixed(root.integral ? 0 : 2)
-        anchors.right: root.right
-        anchors.bottom: root.bottom
-        anchors.bottomMargin: 0
-    }
-
+    
     Binding {
         id: bindingControl
         target: root.config
@@ -66,7 +67,7 @@ Item {
     HifiControls.Slider {
         id: sliderControl
         stepSize: root.integral ? 1.0 : 0.0
-        anchors.left: root.horizontalCenter
+        anchors.left: labelControl.right
         anchors.right: root.right
         anchors.rightMargin: 0
         anchors.top: root.top
@@ -74,4 +75,17 @@ Item {
 
         onValueChanged: { root.valueChanged(value) }
     }
+
+    HifiControls.Label {
+        id: labelValue
+        enabled: root.showValue
+        text: sliderControl.value.toFixed(root.integral ? 0 : 2)
+        anchors.right: labelControl.right
+        anchors.rightMargin: 5
+        anchors.verticalCenter: root.verticalCenter
+    }
+
+
+ 
+
 }
diff --git a/scripts/developer/utilities/render/deferredLighting.qml b/scripts/developer/utilities/render/deferredLighting.qml
index b2d917475e..e3dcb8a4a2 100644
--- a/scripts/developer/utilities/render/deferredLighting.qml
+++ b/scripts/developer/utilities/render/deferredLighting.qml
@@ -36,9 +36,9 @@ Rectangle {
             anchors.left: parent.left
             anchors.right: parent.right 
               
-            spacing: 20
+            spacing: 5
             Column { 
-                spacing: 10
+                spacing: 5
            // padding: 10
                 Repeater {
                     model: [
@@ -61,7 +61,7 @@ Rectangle {
 
 
             Column {
-                spacing: 10
+                spacing: 5
                 Repeater {
                     model: [
                          "Obscurance:LightingModel:enableObscurance",
@@ -81,7 +81,7 @@ Rectangle {
             }
 
             Column {
-                spacing: 10
+                spacing: 5
                 Repeater {
                     model: [
                          "Ambient:LightingModel:enableAmbientLight",
@@ -105,7 +105,7 @@ Rectangle {
         Column {
             anchors.left: parent.left
             anchors.right: parent.right 
-            spacing: 10 
+            spacing: 5 
             Repeater {
                 model: [ "Tone Mapping Exposure:ToneMapping:exposure:5.0:-5.0"
                               ]
@@ -211,9 +211,9 @@ Rectangle {
 
         Separator {}          
         Row {
-            spacing: 10 
+            spacing: 5 
             Column {
-                spacing: 10 
+                spacing: 5 
 
                 HifiControls.CheckBox {
                     boxSize: 20
@@ -254,7 +254,7 @@ Rectangle {
 
             }
             Column {
-                spacing: 10 
+                spacing: 5 
                 HifiControls.CheckBox {
                     boxSize: 20
                     text: "Metas"
@@ -275,6 +275,13 @@ Rectangle {
                 }
             }
         }
+        Separator {}
+        HifiControls.Button {
+            text: "Engine"
+           // activeFocusOnPress: false
+            onClicked: {
+               sendToScript({method: "openEngineView"}); 
+            }
+        }
     }
-    //}
 }
diff --git a/scripts/developer/utilities/render/engineInspector.js b/scripts/developer/utilities/render/engineInspector.js
new file mode 100644
index 0000000000..dcf13157b5
--- /dev/null
+++ b/scripts/developer/utilities/render/engineInspector.js
@@ -0,0 +1,13 @@
+    function openEngineTaskView() {
+    // Set up the qml ui
+        var qml = Script.resolvePath('engineInspector.qml');
+        var window = new OverlayWindow({
+            title: 'Render Engine',
+            source: qml,
+            width: 300, 
+            height: 400
+        });
+        window.setPosition(200, 50);
+        //window.closed.connect(function() { Script.stop(); });
+    }
+    openEngineTaskView();
\ No newline at end of file
diff --git a/scripts/developer/utilities/render/engineInspector.qml b/scripts/developer/utilities/render/engineInspector.qml
new file mode 100644
index 0000000000..1b9941e64e
--- /dev/null
+++ b/scripts/developer/utilities/render/engineInspector.qml
@@ -0,0 +1,30 @@
+//
+//  deferredLighting.qml
+//
+//  Created by Sam Gateau on 6/6/2016
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
+//
+import QtQuick 2.7
+import QtQuick.Controls 1.4
+import QtQuick.Layouts 1.3
+
+import "qrc:///qml/styles-uit"
+import "qrc:///qml/controls-uit" as HifiControls
+
+import "../lib/jet/qml" as Jet
+
+Item {
+    HifiConstants { id: hifi;}
+    id: render;   
+    anchors.fill: parent
+
+    property var mainViewTask: Render.getConfig("RenderMainView")
+
+    Jet.TaskListView {
+        rootConfig: Render
+        anchors.fill: render        
+    }
+}
\ No newline at end of file
diff --git a/scripts/developer/utilities/render/luci.js b/scripts/developer/utilities/render/luci.js
index 6482c884ff..005d96780a 100644
--- a/scripts/developer/utilities/render/luci.js
+++ b/scripts/developer/utilities/render/luci.js
@@ -64,9 +64,6 @@
         button.editProperties({isActive: onLuciScreen});
         wireEventBridge(onLuciScreen);
     }
-
-    function fromQml(message) {
-    }
         
     button.clicked.connect(onClicked);
     tablet.screenChanged.connect(onScreenChanged);
@@ -82,14 +79,6 @@
     Controller.mouseMoveEvent.connect(function (e) { if (moveDebugCursor) setDebugCursor(e.x, e.y); });
 
 
-    Script.scriptEnding.connect(function () {
-        if (onLuciScreen) {
-            tablet.gotoHomeScreen();
-        }
-        button.clicked.disconnect(onClicked);
-        tablet.screenChanged.disconnect(onScreenChanged);
-        tablet.removeButton(button);
-    });
 
     function setDebugCursor(x, y) {
         nx = (x / Window.innerWidth);
@@ -98,4 +87,46 @@
          Render.getConfig("RenderMainView").getConfig("Antialiasing").debugCursorTexcoord = { x: nx, y: ny };
     }
 
+
+    function fromQml(message) {
+        switch (message.method) {
+        case "openEngineView":
+            openEngineTaskView();
+            break;
+        }            
+    }
+
+
+    var engineInspectorView = null 
+    function openEngineTaskView() {
+        if (engineInspectorView == null) {
+            var qml = Script.resolvePath('engineInspector.qml');
+            var window = new OverlayWindow({
+                title: 'Render Engine',
+                source: qml,
+                width: 300, 
+                height: 400
+            });
+            window.setPosition(200, 50);
+            engineInspectorView = window
+            window.closed.connect(function() { engineInspectorView = null; });
+        } else {
+            engineInspectorView.setPosition(200, 50);          
+        }
+    }
+
+
+    
+    Script.scriptEnding.connect(function () {
+        if (onLuciScreen) {
+            tablet.gotoHomeScreen();
+        }
+        button.clicked.disconnect(onClicked);
+        tablet.screenChanged.disconnect(onScreenChanged);
+        tablet.removeButton(button);
+
+        if (engineInspectorView !== null) {
+            engineInspectorView.close()
+        }
+    });
 }()); 
\ No newline at end of file
diff --git a/tests-manual/render-perf/src/main.cpp b/tests-manual/render-perf/src/main.cpp
index 33aea6dcc9..7126b333f6 100644
--- a/tests-manual/render-perf/src/main.cpp
+++ b/tests-manual/render-perf/src/main.cpp
@@ -1107,7 +1107,7 @@ private:
         }
     } };
 
-    render::EnginePointer _renderEngine { new render::Engine() };
+    render::EnginePointer _renderEngine { new render::RenderEngine() };
     render::ScenePointer _main3DScene { new render::Scene(glm::vec3(-0.5f * (float)TREE_SCALE), (float)TREE_SCALE) };
     QSize _size;
     QSettings _settings;