diff --git a/data/assets/spaceDebris.scene b/data/assets/spaceDebris.scene
index 4fe45f780d..beaa95d6eb 100644
--- a/data/assets/spaceDebris.scene
+++ b/data/assets/spaceDebris.scene
@@ -9,7 +9,7 @@ asset.require('scene/solarsystem/planets/earth/earth')
 --assetHelper.requestAll(asset, 'scene/digitaluniverse')
 -- Load default key bindings applicable to most scenes
 asset.require('util/default_keybindings')
---asset.require('util/default_dashboard')
+asset.require('util/default_dashboard')
 --asset.require('util/default_joystick')
 
 asset.require('util/webgui')
diff --git a/modules/space/rendering/renderablesatellites.cpp b/modules/space/rendering/renderablesatellites.cpp
index c1a4c9a282..ee6a81551e 100644
--- a/modules/space/rendering/renderablesatellites.cpp
+++ b/modules/space/rendering/renderablesatellites.cpp
@@ -604,42 +604,26 @@ void RenderableSatellites::initializeGL() {
            );
        }
    );
-<<<<<<< HEAD
-     /*
+     
     _uniformCache.opacity = _programObject->uniformLocation("opacity");
     _uniformCache.modelView = _programObject->uniformLocation("modelViewTransform");
     _uniformCache.projection = _programObject->uniformLocation("projectionTransform");
     _uniformCache.color = _programObject->uniformLocation("color");
     _uniformCache.useLineFade = _programObject->uniformLocation("useLineFade");
     _uniformCache.lineFade = _programObject->uniformLocation("lineFade");
-=======
-    
-    // _uniformCache.opacity = _programObject->uniformLocation("opacity");
-    // _uniformCache.modelView = _programObject->uniformLocation("modelViewTransform");
-    // _uniformCache.projection = _programObject->uniformLocation("projectionTransform");
-    // _uniformCache.color = _programObject->uniformLocation("color");
-    // _uniformCache.useLineFade = _programObject->uniformLocation("useLineFade");
-    // _uniformCache.lineFade = _programObject->uniformLocation("lineFade");
->>>>>>> e4734ae0b3148cae1f230b00570b5e8c723d5b4b
     
     setRenderBin(Renderable::RenderBin::Overlay);
-    */
+    
 }
     
 void RenderableSatellites::deinitializeGL() {
     
     SpaceModule::ProgramObjectManager.release(ProgramName);
     
-<<<<<<< HEAD
     glDeleteBuffers(1, &_vertexBuffer);
     glDeleteBuffers(1, &_indexBuffer);
     glDeleteVertexArrays(1, &_vertexArray);
-    
-=======
-    // glDeleteBuffers(1, &_vertexBuffer);
-    // glDeleteBuffers(1, &_indexBuffer);
-    // glDeleteVertexArrays(1, &_vertexArray);
->>>>>>> e4734ae0b3148cae1f230b00570b5e8c723d5b4b
+
 }
 
     
@@ -652,9 +636,9 @@ bool RenderableSatellites::isReady() const {
 void RenderableSatellites::update(const UpdateData&) {}
     
 void RenderableSatellites::render(const RenderData& data, RendererTasks&) {
-<<<<<<< HEAD
-    /*
+
     _programObject->activate();
+
     _programObject->setUniform(_uniformCache.opacity, _opacity);
 
     glm::dmat4 modelTransform =
@@ -666,59 +650,32 @@ void RenderableSatellites::render(const RenderData& data, RendererTasks&) {
         _uniformCache.modelView,
         data.camera.combinedViewMatrix() * modelTransform
     );
+    
 
     _programObject->setUniform(_uniformCache.projection, data.camera.projectionMatrix());
     _programObject->setUniform(_uniformCache.color, _appearance.lineColor);
-    //_programObject->setUniform(_uniformCache.useLineFade, _appearance.useLineFade);
+    _programObject->setUniform(_uniformCache.useLineFade, _appearance.useLineFade);
+    if (_appearance.useLineFade) {
+        _programObject->setUniform(_uniformCache.lineFade, _appearance.lineFade);
+    }
 
-    //if (_appearance.useLineFade) {
-    //    _programObject->setUniform(_uniformCache.lineFade, _appearance.lineFade);
-    //}
 
     glDepthMask(false);
-    //glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE);
 
+    // Crashes in here
     glBindVertexArray(_vertexArray);
-    glDrawElements(GL_LINES,
-        static_cast<unsigned int>(_indexBufferData.size()),
-        GL_UNSIGNED_INT,
-        0);
+     //glDrawElements(GL_LINES,
+      //  static_cast<GLsizei>(_indexBufferData.size()),
+       // GL_UNSIGNED_INT,
+       // 0);
+    glDrawArrays(GL_LINES,
+        0,
+        static_cast<unsigned int>(_indexBufferData.size()));
     glBindVertexArray(0);
+
     _programObject->deactivate();
-    */
-=======
-    // _programObject->activate();
-    // _programObject->setUniform(_uniformCache.opacity, _opacity);
 
-    // glm::dmat4 modelTransform =
-    //     glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-    //     glm::dmat4(data.modelTransform.rotation) *
-    //     glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-    // _programObject->setUniform(
-    //    _uniformCache.modelView,
-    //    data.camera.combinedViewMatrix() * modelTransform
-    // );
-
-    // _programObject->setUniform(_uniformCache.projection, data.camera.projectionMatrix());
-    // _programObject->setUniform(_uniformCache.color, _appearance.lineColor);
-    // _programObject->setUniform(_uniformCache.useLineFade, _appearance.useLineFade);
-
-    // if (_appearance.useLineFade) {
-    //     _programObject->setUniform(_uniformCache.lineFade, _appearance.lineFade);
-    // }
-
-    // glDepthMask(false);
-    // //glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-
-    // glBindVertexArray(_vertexArray);
-    // glDrawElements(GL_LINES,
-    //     static_cast<unsigned int>(_indexBufferData.size()),
-    //     GL_UNSIGNED_INT,
-    //     0);
-    // glBindVertexArray(0);
-    // _programObject->deactivate();
->>>>>>> e4734ae0b3148cae1f230b00570b5e8c723d5b4b
 }
 
 void RenderableSatellites::updateBuffers() {
diff --git a/modules/space/rendering/renderablesatellites.h b/modules/space/rendering/renderablesatellites.h
index d960908850..57ff4714a9 100644
--- a/modules/space/rendering/renderablesatellites.h
+++ b/modules/space/rendering/renderablesatellites.h
@@ -104,10 +104,10 @@ namespace openspace {
         properties::StringProperty _meanAnomalyAtEpochColumnName;
         properties::StringProperty _epochColumnName;
 
-        //RenderableTrail::Appearance _appearance;
+        RenderableTrail::Appearance _appearance;
 
-        //UniformCache(opacity, modelView, projection, color, useLineFade, lineFade)
-        //   _uniformCache;
+        UniformCache(opacity, modelView, projection, color, useLineFade, lineFade)
+           _uniformCache;
 
         /**
          * Reads the provided TLE file and calles the KeplerTranslation::setKeplerElments