diff --git a/include/openspace/rendering/renderable.h b/include/openspace/rendering/renderable.h
index 9ea3656f9a..56ddd157a2 100644
--- a/include/openspace/rendering/renderable.h
+++ b/include/openspace/rendering/renderable.h
@@ -74,7 +74,6 @@ public:
     void setBoundingSphere(float boundingSphere);
     float boundingSphere() const;
 
-    virtual void render(const RenderData& data);
     virtual void render(const RenderData& data, RendererTasks& rendererTask);
     virtual void update(const UpdateData& data);
     virtual SurfacePositionHandle calculateSurfacePositionHandle(
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 222955ba1a..306fbfa497 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -176,7 +176,7 @@ bool RenderableModel::deinitialize() {
     return true;
 }
 
-void RenderableModel::render(const RenderData& data) {
+void RenderableModel::render(const RenderData& data, RendererTasks&) {
     _programObject->activate();
     
     // Fading
diff --git a/modules/base/rendering/renderablemodel.h b/modules/base/rendering/renderablemodel.h
index 61629f033f..fadd85bde6 100644
--- a/modules/base/rendering/renderablemodel.h
+++ b/modules/base/rendering/renderablemodel.h
@@ -56,7 +56,7 @@ public:
 
     bool isReady() const override;
 
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
 
     static documentation::Documentation Documentation();
diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp
index ad80ed2699..75aef3b932 100644
--- a/modules/base/rendering/renderableplane.cpp
+++ b/modules/base/rendering/renderableplane.cpp
@@ -173,7 +173,7 @@ bool RenderablePlane::deinitialize() {
     return true;
 }
 
-void RenderablePlane::render(const RenderData& data) {
+void RenderablePlane::render(const RenderData& data, RendererTasks&) {
     _shader->activate();
     //if (_projectionListener){
     //    //get parent node-texture and set with correct dimensions  
diff --git a/modules/base/rendering/renderableplane.h b/modules/base/rendering/renderableplane.h
index 170c79945b..4b49246dbe 100644
--- a/modules/base/rendering/renderableplane.h
+++ b/modules/base/rendering/renderableplane.h
@@ -58,7 +58,7 @@ public:
 
     bool isReady() const override;
 
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
 
     static documentation::Documentation Documentation();
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index cbb1b53ecd..79959887bf 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -181,7 +181,7 @@ bool RenderableSphere::deinitialize() {
     return true;
 }
 
-void RenderableSphere::render(const RenderData& data) {
+void RenderableSphere::render(const RenderData& data, RendererTasks&) {
     glm::mat4 transform = glm::mat4(1.0);
 
     transform = glm::rotate(transform, static_cast<float>(M_PI_2), glm::vec3(1, 0, 0));
diff --git a/modules/base/rendering/renderablesphere.h b/modules/base/rendering/renderablesphere.h
index 83bf22771f..12417125d2 100644
--- a/modules/base/rendering/renderablesphere.h
+++ b/modules/base/rendering/renderablesphere.h
@@ -54,7 +54,7 @@ public:
 
     bool isReady() const override;
 
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
 
     static documentation::Documentation Documentation();
diff --git a/modules/base/rendering/renderablesphericalgrid.cpp b/modules/base/rendering/renderablesphericalgrid.cpp
index ef339098c3..0f4b593d9c 100644
--- a/modules/base/rendering/renderablesphericalgrid.cpp
+++ b/modules/base/rendering/renderablesphericalgrid.cpp
@@ -197,7 +197,7 @@ bool RenderableSphericalGrid::initialize(){
     return completeSuccess;
 }
 
-void RenderableSphericalGrid::render(const RenderData& data){
+void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&){
     _gridProgram->activate();
 
     glm::mat4 transform;
diff --git a/modules/base/rendering/renderablesphericalgrid.h b/modules/base/rendering/renderablesphericalgrid.h
index 914012adbc..54673c86b5 100644
--- a/modules/base/rendering/renderablesphericalgrid.h
+++ b/modules/base/rendering/renderablesphericalgrid.h
@@ -43,7 +43,7 @@ public:
 
     bool isReady() const override;
 
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
 
 protected:
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index 29bb12aa3e..1825e32376 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -217,7 +217,7 @@ bool RenderableTrail::isReady() const {
     return _programObject != nullptr;
 }
 
-void RenderableTrail::render(const RenderData & data) {
+void RenderableTrail::render(const RenderData& data, RendererTasks&) {
     _programObject->activate();
 
     glm::dmat4 modelTransform =
diff --git a/modules/base/rendering/renderabletrail.h b/modules/base/rendering/renderabletrail.h
index 3b48f091dd..962bdf5245 100644
--- a/modules/base/rendering/renderabletrail.h
+++ b/modules/base/rendering/renderabletrail.h
@@ -84,7 +84,7 @@ public:
      * \c _floatingRenderInformation using the provided \p data
      * \param data The data that is necessary to render this Renderable
      */
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
 
 protected:
     explicit RenderableTrail(const ghoul::Dictionary& dictionary);
diff --git a/modules/debugging/rendering/renderabledebugplane.cpp b/modules/debugging/rendering/renderabledebugplane.cpp
index 80b5fd9372..1cc77421d2 100644
--- a/modules/debugging/rendering/renderabledebugplane.cpp
+++ b/modules/debugging/rendering/renderabledebugplane.cpp
@@ -152,7 +152,7 @@ bool RenderableDebugPlane::deinitialize() {
     return true;
 }
 
-void RenderableDebugPlane::render(const RenderData& data) {
+void RenderableDebugPlane::render(const RenderData& data, RendererTasks&) {
     glm::mat4 transform = glm::mat4(1.0);
     if (_billboard)
         transform = glm::inverse(glm::mat4(data.camera.viewRotationMatrix()));
diff --git a/modules/debugging/rendering/renderabledebugplane.h b/modules/debugging/rendering/renderabledebugplane.h
index 07665a48f9..aa3dbd8fed 100644
--- a/modules/debugging/rendering/renderabledebugplane.h
+++ b/modules/debugging/rendering/renderabledebugplane.h
@@ -51,7 +51,7 @@ public:
 
     bool isReady() const override;
 
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
 
 private:
diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp
index 91d92a9fb1..0240dc897e 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.cpp
+++ b/modules/fieldlines/rendering/renderablefieldlines.cpp
@@ -239,7 +239,7 @@ bool RenderableFieldlines::deinitialize() {
     return true;
 }
 
-void RenderableFieldlines::render(const RenderData& data) {
+void RenderableFieldlines::render(const RenderData& data, RendererTasks&) {
     _program->activate();
     _program->setUniform("modelViewProjection", data.camera.viewProjectionMatrix());
     _program->setUniform("modelTransform", glm::mat4(1.0));
diff --git a/modules/fieldlines/rendering/renderablefieldlines.h b/modules/fieldlines/rendering/renderablefieldlines.h
index dbad9471f2..1827b83353 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.h
+++ b/modules/fieldlines/rendering/renderablefieldlines.h
@@ -50,7 +50,7 @@ public:
 
     bool isReady() const override;
 
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
 
 private:
diff --git a/modules/globebrowsing/globes/chunkedlodglobe.cpp b/modules/globebrowsing/globes/chunkedlodglobe.cpp
index c50b33af0d..91c4e92ad0 100644
--- a/modules/globebrowsing/globes/chunkedlodglobe.cpp
+++ b/modules/globebrowsing/globes/chunkedlodglobe.cpp
@@ -278,7 +278,7 @@ void ChunkedLodGlobe::notifyShaderRecompilation() {
     _shadersNeedRecompilation = true;
 }
 
-void ChunkedLodGlobe::render(const RenderData& data) {
+void ChunkedLodGlobe::render(const RenderData& data, RendererTasks&) {
     stats.startNewRecord();
     if (_shadersNeedRecompilation) {
         _renderer->recompileShaders(_owner);
diff --git a/modules/globebrowsing/globes/chunkedlodglobe.h b/modules/globebrowsing/globes/chunkedlodglobe.h
index 5d3f9ad65e..15f9ea3091 100644
--- a/modules/globebrowsing/globes/chunkedlodglobe.h
+++ b/modules/globebrowsing/globes/chunkedlodglobe.h
@@ -56,7 +56,7 @@ public:
     bool deinitialize() override;
     bool isReady() const override;
 
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
 
     /**
diff --git a/modules/globebrowsing/globes/pointglobe.cpp b/modules/globebrowsing/globes/pointglobe.cpp
index a21be861b3..c81f4ec215 100644
--- a/modules/globebrowsing/globes/pointglobe.cpp
+++ b/modules/globebrowsing/globes/pointglobe.cpp
@@ -103,7 +103,7 @@ bool PointGlobe::isReady() const {
     return (_vaoID != 0) && (_vertexBufferID != 0);
 }
     
-void PointGlobe::render(const RenderData& data) {
+void PointGlobe::render(const RenderData& data, RendererTasks&) {
     _programObject->activate();
 
     // Calculate variables to be used as uniform variables in shader
diff --git a/modules/globebrowsing/globes/pointglobe.h b/modules/globebrowsing/globes/pointglobe.h
index 957c36ec44..59cd91fdee 100644
--- a/modules/globebrowsing/globes/pointglobe.h
+++ b/modules/globebrowsing/globes/pointglobe.h
@@ -45,7 +45,7 @@ public:
     bool deinitialize() override;
     bool isReady() const override;
 
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
     
 private:
     const RenderableGlobe& _owner;
diff --git a/modules/globebrowsing/globes/renderableglobe.cpp b/modules/globebrowsing/globes/renderableglobe.cpp
index 52c9c873a7..281d5b253a 100644
--- a/modules/globebrowsing/globes/renderableglobe.cpp
+++ b/modules/globebrowsing/globes/renderableglobe.cpp
@@ -156,7 +156,7 @@ bool RenderableGlobe::isReady() const {
     return true;
 }
 
-void RenderableGlobe::render(const RenderData& data) {
+void RenderableGlobe::render(const RenderData& data, RendererTasks& tasks) {
     bool statsEnabled = _debugProperties.collectStats.value();
     _chunkedLodGlobe->stats.setEnabled(statsEnabled);
 
@@ -176,7 +176,7 @@ void RenderableGlobe::render(const RenderData& data) {
                 setSaveCamera(nullptr);
             }
         }
-        _distanceSwitch.render(data);
+        _distanceSwitch.render(data, tasks);
     }
     if (_savedCamera != nullptr) {
         DebugRenderer::ref().renderCameraFrustum(data, *_savedCamera);
diff --git a/modules/globebrowsing/globes/renderableglobe.h b/modules/globebrowsing/globes/renderableglobe.h
index baf0b60cb0..8c0fa506cc 100644
--- a/modules/globebrowsing/globes/renderableglobe.h
+++ b/modules/globebrowsing/globes/renderableglobe.h
@@ -87,7 +87,7 @@ public:
     bool deinitialize() override;
     bool isReady() const override;
 
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
 
     // Getters that perform calculations
diff --git a/modules/globebrowsing/other/distanceswitch.cpp b/modules/globebrowsing/other/distanceswitch.cpp
index 3660d3af2e..8e74e5f9ac 100644
--- a/modules/globebrowsing/other/distanceswitch.cpp
+++ b/modules/globebrowsing/other/distanceswitch.cpp
@@ -44,7 +44,7 @@ bool DistanceSwitch::deinitialize() {
     return true;
 }
 
-void DistanceSwitch::render(const RenderData& data) {
+void DistanceSwitch::render(const RenderData& data, RendererTasks& tasks) {
     const double distanceToCamera =
         distance(data.camera.positionVec3(), data.modelTransform.translation);
 
@@ -57,7 +57,7 @@ void DistanceSwitch::render(const RenderData& data) {
     for (std::shared_ptr<Renderable> renderable : _renderables) {
         const double distance = res * renderable->boundingSphere() / tan(fov / 2);
         if (distanceToCamera < distance) {
-            renderable->render(data);
+            renderable->render(data, tasks);
         }
     }
 }
diff --git a/modules/globebrowsing/other/distanceswitch.h b/modules/globebrowsing/other/distanceswitch.h
index 1f9c83b3b8..45d9a6bd3c 100644
--- a/modules/globebrowsing/other/distanceswitch.h
+++ b/modules/globebrowsing/other/distanceswitch.h
@@ -31,6 +31,7 @@
 namespace openspace {
     class Renderable;
     struct RenderData;
+    struct RendererTasks;
     struct UpdateData;
 } // namespace openspace
 
@@ -51,7 +52,7 @@ public:
      * Picks the first Renderable with the associated maxDistance greater than the 
      * current distance to the camera
      */
-    void render(const RenderData& data);
+    void render(const RenderData& data, RendererTasks& rendererTask);
     void update(const UpdateData& data);
 
     /**
diff --git a/modules/iswa/rendering/iswacygnet.cpp b/modules/iswa/rendering/iswacygnet.cpp
index 5d3f98372f..0b3985b3ac 100644
--- a/modules/iswa/rendering/iswacygnet.cpp
+++ b/modules/iswa/rendering/iswacygnet.cpp
@@ -104,6 +104,7 @@ IswaCygnet::IswaCygnet(const ghoul::Dictionary& dictionary)
 }
 
 IswaCygnet::~IswaCygnet(){}
+
 bool IswaCygnet::initialize(){
     _textures.push_back(nullptr);
     
@@ -145,7 +146,7 @@ bool IswaCygnet::isReady() const{
     return ready;
 }
 
-void IswaCygnet::render(const RenderData& data){
+void IswaCygnet::render(const RenderData& data, RendererTasks&){
     if(!readyToRender()) return;
     
     psc position = data.position;
diff --git a/modules/iswa/rendering/iswacygnet.h b/modules/iswa/rendering/iswacygnet.h
index 234e0105ce..edbc4a1b5b 100644
--- a/modules/iswa/rendering/iswacygnet.h
+++ b/modules/iswa/rendering/iswacygnet.h
@@ -73,7 +73,7 @@ public:
     virtual bool initialize();
     virtual bool deinitialize();
     virtual bool isReady() const;
-    void render(const RenderData& data);
+    void render(const RenderData& data, RendererTasks& rendererTask);
     void update(const UpdateData& data);
 
 protected:
diff --git a/modules/newhorizons/rendering/renderablecrawlingline.cpp b/modules/newhorizons/rendering/renderablecrawlingline.cpp
index 2bbb19d074..a4516d0e1c 100644
--- a/modules/newhorizons/rendering/renderablecrawlingline.cpp
+++ b/modules/newhorizons/rendering/renderablecrawlingline.cpp
@@ -186,7 +186,7 @@ bool RenderableCrawlingLine::deinitialize(){
     return true;
 }
 
-void RenderableCrawlingLine::render(const RenderData& data) {
+void RenderableCrawlingLine::render(const RenderData& data, RendererTasks&) {
     if (!_drawLine) {
         return;
     }
diff --git a/modules/newhorizons/rendering/renderablecrawlingline.h b/modules/newhorizons/rendering/renderablecrawlingline.h
index c31b2981c7..c34129f26a 100644
--- a/modules/newhorizons/rendering/renderablecrawlingline.h
+++ b/modules/newhorizons/rendering/renderablecrawlingline.h
@@ -43,7 +43,7 @@ public:
 
     bool isReady() const override;
 
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
 
     static documentation::Documentation Documentation();
diff --git a/modules/newhorizons/rendering/renderablefov.cpp b/modules/newhorizons/rendering/renderablefov.cpp
index 6e1f64d90a..a56b153f38 100644
--- a/modules/newhorizons/rendering/renderablefov.cpp
+++ b/modules/newhorizons/rendering/renderablefov.cpp
@@ -947,7 +947,7 @@ void RenderableFov::computeIntercepts(const UpdateData& data, const std::string&
 }
 #endif
 
-void RenderableFov::render(const RenderData& data) {
+void RenderableFov::render(const RenderData& data, RendererTasks&) {
     if (_drawFOV) {
         _programObject->activate();
 
diff --git a/modules/newhorizons/rendering/renderablefov.h b/modules/newhorizons/rendering/renderablefov.h
index 597b7fe919..4694f0f7c0 100644
--- a/modules/newhorizons/rendering/renderablefov.h
+++ b/modules/newhorizons/rendering/renderablefov.h
@@ -54,7 +54,7 @@ public:
 
     bool isReady() const override;
 
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
     
     static documentation::Documentation Documentation();
diff --git a/modules/newhorizons/rendering/renderablemodelprojection.cpp b/modules/newhorizons/rendering/renderablemodelprojection.cpp
index 9d24f85e6d..96ed828936 100644
--- a/modules/newhorizons/rendering/renderablemodelprojection.cpp
+++ b/modules/newhorizons/rendering/renderablemodelprojection.cpp
@@ -214,7 +214,7 @@ ghoul::opengl::Texture& RenderableModelProjection::baseTexture() const {
     return _projectionComponent.projectionTexture();
 }
 
-void RenderableModelProjection::render(const RenderData& data) {
+void RenderableModelProjection::render(const RenderData& data, RendererTasks&) {
     if (_projectionComponent.needsClearProjection())
         _projectionComponent.clearAllProjections();
 
diff --git a/modules/newhorizons/rendering/renderablemodelprojection.h b/modules/newhorizons/rendering/renderablemodelprojection.h
index 85198c08e6..1b0cc9b22d 100644
--- a/modules/newhorizons/rendering/renderablemodelprojection.h
+++ b/modules/newhorizons/rendering/renderablemodelprojection.h
@@ -60,7 +60,7 @@ public:
 
     bool isReady() const override;
 
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
     virtual void update(const UpdateData& data) final override;
 
     ghoul::opengl::Texture& baseTexture() const;
diff --git a/modules/newhorizons/rendering/renderableplaneprojection.cpp b/modules/newhorizons/rendering/renderableplaneprojection.cpp
index adc506b196..7ac1dbb430 100644
--- a/modules/newhorizons/rendering/renderableplaneprojection.cpp
+++ b/modules/newhorizons/rendering/renderableplaneprojection.cpp
@@ -129,7 +129,7 @@ bool RenderablePlaneProjection::deinitialize() {
     return true;
 }
 
-void RenderablePlaneProjection::render(const RenderData& data) {
+void RenderablePlaneProjection::render(const RenderData& data, RendererTasks&) {
     bool active = ImageSequencer::ref().instrumentActive(_instrument);
     if (!_hasImage || (_moving && !active))
         return;
diff --git a/modules/newhorizons/rendering/renderableplaneprojection.h b/modules/newhorizons/rendering/renderableplaneprojection.h
index 88b6d1034c..c4f7af8557 100644
--- a/modules/newhorizons/rendering/renderableplaneprojection.h
+++ b/modules/newhorizons/rendering/renderableplaneprojection.h
@@ -60,7 +60,7 @@ public:
 
     bool isReady() const override;
 
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
 
 private:
diff --git a/modules/newhorizons/rendering/renderableplanetprojection.cpp b/modules/newhorizons/rendering/renderableplanetprojection.cpp
index 8cb9a7575d..f2b649d472 100644
--- a/modules/newhorizons/rendering/renderableplanetprojection.cpp
+++ b/modules/newhorizons/rendering/renderableplanetprojection.cpp
@@ -374,7 +374,7 @@ ghoul::opengl::Texture& RenderablePlanetProjection::baseTexture() const {
     return _projectionComponent.projectionTexture();
 }
 
-void RenderablePlanetProjection::render(const RenderData& data) {
+void RenderablePlanetProjection::render(const RenderData& data, RendererTasks&) {
     if (_projectionComponent.needsClearProjection())
         _projectionComponent.clearAllProjections();
 
diff --git a/modules/newhorizons/rendering/renderableplanetprojection.h b/modules/newhorizons/rendering/renderableplanetprojection.h
index 1510ac3e2d..3571edb979 100644
--- a/modules/newhorizons/rendering/renderableplanetprojection.h
+++ b/modules/newhorizons/rendering/renderableplanetprojection.h
@@ -48,7 +48,7 @@ public:
     bool deinitialize() override;
     bool isReady() const override;
 
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
     ghoul::opengl::Texture& baseTexture() const;
 
diff --git a/modules/newhorizons/rendering/renderableshadowcylinder.cpp b/modules/newhorizons/rendering/renderableshadowcylinder.cpp
index 1168284055..9ab8c44c52 100644
--- a/modules/newhorizons/rendering/renderableshadowcylinder.cpp
+++ b/modules/newhorizons/rendering/renderableshadowcylinder.cpp
@@ -105,7 +105,7 @@ bool RenderableShadowCylinder::isReady() const {
     return true;
 }
     
-void RenderableShadowCylinder::render(const RenderData& data){
+void RenderableShadowCylinder::render(const RenderData& data, RendererTasks&) {
     glDepthMask(false);
     _shader->activate();
 
diff --git a/modules/newhorizons/rendering/renderableshadowcylinder.h b/modules/newhorizons/rendering/renderableshadowcylinder.h
index aa6b0c59b0..6f32334a5b 100644
--- a/modules/newhorizons/rendering/renderableshadowcylinder.h
+++ b/modules/newhorizons/rendering/renderableshadowcylinder.h
@@ -50,7 +50,7 @@ public:
     bool deinitialize() override;
 
     bool isReady() const override;
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
 
 private:
diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp
index 5bc3ed4003..0566ded92d 100644
--- a/modules/space/rendering/renderableconstellationbounds.cpp
+++ b/modules/space/rendering/renderableconstellationbounds.cpp
@@ -169,7 +169,7 @@ bool RenderableConstellationBounds::isReady() const {
     return (_vao != 0) && (_vbo != 0) && _program;
 }
 
-void RenderableConstellationBounds::render(const RenderData& data) {
+void RenderableConstellationBounds::render(const RenderData& data, RendererTasks&) {
     _program->activate();
 
     setPscUniforms(*_program.get(), data.camera, data.position);
diff --git a/modules/space/rendering/renderableconstellationbounds.h b/modules/space/rendering/renderableconstellationbounds.h
index 8ba102fbea..ec88c5eb71 100644
--- a/modules/space/rendering/renderableconstellationbounds.h
+++ b/modules/space/rendering/renderableconstellationbounds.h
@@ -54,7 +54,7 @@ public:
 
     bool isReady() const override;
 
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
 
     static documentation::Documentation Documentation();
 
diff --git a/modules/space/rendering/renderableplanet.cpp b/modules/space/rendering/renderableplanet.cpp
index 0b44e19b1b..9a82bf2881 100644
--- a/modules/space/rendering/renderableplanet.cpp
+++ b/modules/space/rendering/renderableplanet.cpp
@@ -351,7 +351,7 @@ bool RenderablePlanet::isReady() const {
     return ready;
 }
 
-void RenderablePlanet::render(const RenderData& data) {
+void RenderablePlanet::render(const RenderData& data, RendererTasks&) {
     // activate shader
     _programObject->activate();
 
diff --git a/modules/space/rendering/renderableplanet.h b/modules/space/rendering/renderableplanet.h
index 4e154246f5..bd037b6292 100644
--- a/modules/space/rendering/renderableplanet.h
+++ b/modules/space/rendering/renderableplanet.h
@@ -72,7 +72,7 @@ public:
     bool deinitialize() override;
     bool isReady() const override;
 
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
 
     static documentation::Documentation Documentation();
diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp
index 94bb692937..b6074a622f 100644
--- a/modules/space/rendering/renderablerings.cpp
+++ b/modules/space/rendering/renderablerings.cpp
@@ -169,7 +169,7 @@ bool RenderableRings::deinitialize() {
     return true;
 }
 
-void RenderableRings::render(const RenderData& data) {
+void RenderableRings::render(const RenderData& data, RendererTasks&) {
     _shader->activate();
 
     glm::dmat4 modelTransform =
diff --git a/modules/space/rendering/renderablerings.h b/modules/space/rendering/renderablerings.h
index 2e96c9eb89..446ec280dd 100644
--- a/modules/space/rendering/renderablerings.h
+++ b/modules/space/rendering/renderablerings.h
@@ -51,7 +51,7 @@ public:
 
     bool isReady() const override;
 
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
 
     static documentation::Documentation Documentation();
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index afcb030183..a1c203681c 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -234,7 +234,7 @@ bool RenderableStars::deinitialize() {
     return true;
 }
 
-void RenderableStars::render(const RenderData& data) {
+void RenderableStars::render(const RenderData& data, RendererTasks&) {
     glDepthMask(false);
     _program->activate();
 
diff --git a/modules/space/rendering/renderablestars.h b/modules/space/rendering/renderablestars.h
index 1fd9f6242e..c346eac3e8 100644
--- a/modules/space/rendering/renderablestars.h
+++ b/modules/space/rendering/renderablestars.h
@@ -53,7 +53,7 @@ public:
 
     bool isReady() const override;
 
-    void render(const RenderData& data) override;
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
 
     static documentation::Documentation Documentation();
diff --git a/modules/touch/src/TouchInteraction.cpp b/modules/touch/src/TouchInteraction.cpp
index 556e545554..e21000d665 100644
--- a/modules/touch/src/TouchInteraction.cpp
+++ b/modules/touch/src/TouchInteraction.cpp
@@ -47,7 +47,18 @@
 #include <cmath>
 #include <functional>
 #include <fstream>
-//#include <glm/ext.hpp>
+
+#ifdef WIN32
+#pragma warning (push)
+#pragma warning (disable : 4310) // cast truncates constant value
+#endif // WIN32
+
+#include <glm/ext.hpp>
+
+#pragma warning (pop)
+#ifdef WIN32
+
+#endif // WIN32
 
 
 #include <openspace/engine/wrapper/windowwrapper.h>
diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp
index 568f4368ed..548ffc7e23 100644
--- a/src/rendering/renderable.cpp
+++ b/src/rendering/renderable.cpp
@@ -152,11 +152,7 @@ float Renderable::boundingSphere() const {
 
 void Renderable::update(const UpdateData&) {}
 
-void Renderable::render(const RenderData& data, RendererTasks&) {
-    render(data);
-}
-
-void Renderable::render(const RenderData&) {}
+void Renderable::render(const RenderData& data, RendererTasks&) {}
 
 SurfacePositionHandle Renderable::calculateSurfacePositionHandle(
                                                        const glm::dvec3& targetModelSpace)