Solve conflict

.gitignore

@@ -34,17 +34,8 @@ log.html
 ScriptLog.txt
 
 data/scene/atmosphereearth/textures
-data/scene/dawn/ceres/textures
-data/scene/dawn/dawn/obj
-data/scene/dawn/dawn/textures
-data/scene/dawn/vestaprojection/textures
-data/scene/dawn/vestaprojection/VestaComet
 data/scene/debugglobe/textures
 data/scene/earth/textures
-data/scene/juno/juno/Juno.mtl
-data/scene/juno/juno/Juno.obj
-data/scene/juno/juno/spice
-data/scene/juno/juno/textures
 data/scene/jupiter/callisto/textures
 data/scene/jupiter/europa/textures
 data/scene/jupiter/ganymede/textures
@@ -54,24 +45,38 @@ data/scene/mars/textures
 data/scene/mercury/textures
 data/scene/milkyway/textures
 data/scene/milkyway-eso/textures
+data/scene/missions/dawn/ceres/textures
+data/scene/missions/dawn/dawn/obj
+data/scene/missions/dawn/dawn/textures
+data/scene/missions/dawn/vestaprojection/textures
+data/scene/missions/dawn/vestaprojection/VestaComet
+data/scene/missions/juno/juno/Juno.mtl
+data/scene/missions/juno/juno/Juno.obj
+data/scene/missions/juno/juno/spice
+data/scene/missions/juno/juno/textures
+data/scene/missions/newhorizons/jupiter/callisto/textures
+data/scene/missions/newhorizons/jupiter/europa/textures
+data/scene/missions/newhorizons/jupiter/ganymede/textures
+data/scene/missions/newhorizons/jupiter/io/textures
+data/scene/missions/newhorizons/jupiter/jupiter/ProjectionsOfInterest
+data/scene/missions/newhorizons/newhorizons/models
+data/scene/missions/newhorizons/newhorizons/textures
+data/scene/missions/newhorizons/pluto/charon/textures
+data/scene/missions/newhorizons/pluto/pluto/assets
+data/scene/missions/newhorizons/pluto/pluto/full_images
+data/scene/missions/newhorizons/pluto/pluto/images
+data/scene/missions/newhorizons/pluto/pluto/textures
+data/scene/missions/osirisrex/bennu/models
+data/scene/missions/osirisrex/bennu/textures
+data/scene/missions/osirisrex/osirisrex/models
+data/scene/missions/osirisrex/osirisrex/textures
+data/scene/missions/rosetta/67P/obj
+data/scene/missions/rosetta/67P/rosettaimages
+data/scene/missions/rosetta/67P/textures
+data/scene/missions/rosetta/rosetta/rosetta
+data/scene/missions/rosetta/rosetta/textures
 data/scene/moon/textures
 data/scene/neptune/textures
-data/scene/newhorizons/jupiter/callisto/textures
-data/scene/newhorizons/jupiter/europa/textures
-data/scene/newhorizons/jupiter/ganymede/textures
-data/scene/newhorizons/jupiter/io/textures
-data/scene/newhorizons/jupiter/jupiter/ProjectionsOfInterest
-data/scene/newhorizons/newhorizons/models
-data/scene/newhorizons/newhorizons/textures
-data/scene/newhorizons/pluto/charon/textures
-data/scene/newhorizons/pluto/pluto/assets
-data/scene/newhorizons/pluto/pluto/full_images
-data/scene/newhorizons/pluto/pluto/images
-data/scene/newhorizons/pluto/pluto/textures
-data/scene/osirisrex/bennu/models
-data/scene/osirisrex/bennu/textures
-data/scene/osirisrex/osirisrex/models
-data/scene/osirisrex/osirisrex/textures
 data/scene/pluto/textures
 data/scene/saturn/dione/textures
 data/scene/saturn/enceladus/textures
@@ -81,11 +86,6 @@ data/scene/saturn/rhea/textures
 data/scene/saturn/saturn/textures
 data/scene/saturn/tethys/textures
 data/scene/saturn/titan/textures
-data/scene/rosetta/67P/obj
-data/scene/rosetta/67P/rosettaimages
-data/scene/rosetta/67P/textures
-data/scene/rosetta/rosetta/rosetta
-data/scene/rosetta/rosetta/textures
 data/scene/stars/colorbv.cmap
 data/scene/stars/speck
 data/scene/stars/textures

data/scene/atmosphereearth.scene

@@ -10,7 +10,7 @@ function preInitialization()
     openspace.spice.loadKernel("${SPICE}/pck00010.tpc")
 
     openspace.time.setTime(openspace.time.currentWallTime())
-    dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
+    dofile(openspace.absPath('${SCRIPTS}/bind_common_keys.lua'))
 end
 
 function postInitialization()

data/scene/dawn.scene

@@ -10,7 +10,7 @@ function preInitialization()
     openspace.spice.loadKernel("${SPICE}/pck00010.tpc")
 
     openspace.time.setTime("2011 AUG 06 00:00:00")
-    dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
+    dofile(openspace.absPath('${SCRIPTS}/bind_common_keys.lua'))
 end
 
 function postInitialization()
@@ -46,18 +46,14 @@ return {
         "venus",
         "earth",
         "mars",
-        "jupiter",
-        "saturn",
+        "jupiter/jupiter",
+        "saturn/saturn",
         "uranus",
         "neptune",
         "pluto",
         "stars",
         "milkyway",
-        "rosetta",
-        "67P",
-        "dawn",
-        "vestaprojection",
-        "ceres"
+        "missions/dawn"
     }
 }
 

data/scene/debugmodel.scene

@@ -1,53 +0,0 @@
--- TextureResolution = "low"
-TextureResolution = "med"
--- TextureResolution = "high"
-
-function preInitialization()
-    --[[
-    The scripts in this function are executed after the scene is loaded but before the
-    scene elements have been initialized, thus they should be used to set the time at
-    which the scene should start and other settings that might determine initialization
-    critical objects.
-    ]]--
-
-    dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
-
-    openspace.spice.loadKernel("${SPICE}/naif0011.tls")
-    openspace.spice.loadKernel("${SPICE}/pck00010.tpc")
-
-    openspace.time.setTime("2018-10-25T04:00:00.00")
-    openspace.time.setDeltaTime(0)
-end
-
-function postInitialization()
-    --[[
-    The scripts in this function are executed after all objects in the scene have been
-    created and initialized, but before the first render call. This is the place to set
-    graphical settings for the renderables.
-    ]]--
-    openspace.printInfo("Setting default values")
-
-    openspace.setPropertyValue("Sun.renderable.enabled", false)
-    openspace.setPropertyValue("SunGlare.renderable.enabled", false)
-    openspace.setPropertyValue("SunMarker.renderable.enabled", false)
-
-    openspace.printInfo("Done setting default values")
-
-    openspace.resetCameraDirection()
-end
-
-return {
-    ScenePath = ".",
-    CommonFolder = "common",
-    Camera = {
-        Focus = "DebugModel",
-        Position = {292946.630948, 377755.961928, 366248.427057},
-        Rotation = {0.732615, -0.137003, 0.430036, 0.509485},
-    },
-    Modules = {
-        "sun",
-        "stars",
-        "debugmodel",
-    }
-}
-

data/scene/default-moon.scene

@@ -1,93 +0,0 @@
-function preInitialization()
-    --[[
-    The scripts in this function are executed after the scene is loaded but before the
-    scene elements have been initialized, thus they should be used to set the time at
-    which the scene should start and other settings that might determine initialization
-    critical objects.
-    ]]--
-
-    --YYYY-MM-DDTHH:MN:SS
-    --openspace.time.setTime(openspace.time.currentWallTime())
-     --[[
-     --   March 9, 2016 total eclipse times from land
-     --   Palembang, South Sumatra, Indonesia
-     --   Partial solar eclipse begins: 6:20 a.m. local Western Indonesian Time
-     --   Total solar eclipse begins: 7:20 a.m. local time
-     --   Maximum eclipse: 7:21 a.m. local time
-     --   Total solar eclipse ends: 7:22 a.m. local time
-     --   Partial solar eclipse ends: 8:31 a.m. local time
-
-     --   6:20 -> 23:20 day before in UTC
-    ]]--
-    openspace.spice.loadKernel("${SPICE}/naif0011.tls")
-    openspace.spice.loadKernel("${SPICE}/pck00010.tpc")
-
-    openspace.time.setTime("2016-03-08T22:45:00")
-
-
-    -- Total Lunar Eclipse Jan 31, 2018 at 10:51:13 UTC
-    -- Regions seeing, at least, some parts of the eclipse: North/East Europe,
-    -- Asia, Australia, North/East Africa, North America, North/East South America,
-    -- Pacific, Atlantic, Indian Ocean, Arctic, Antarctica.
-    --openspace.time.setTime("2018-01-31T10:30:00")
-
-    --openspace.time.setDeltaTime(200.0)
-    dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
-end
-
-function postInitialization()
-    --[[
-    The scripts in this function are executed after all objects in the scene have been
-    created and initialized, but before the first render call. This is the place to set
-    graphical settings for the renderables.
-    ]]--
-    openspace.printInfo("Setting default values")
-    openspace.setPropertyValue("Sun.renderable.enabled", false)
-    openspace.setPropertyValue("SunMarker.renderable.enabled", false)
-    openspace.setPropertyValue("EarthMarker.renderable.enabled", false)
-    --openspace.setPropertyValue("Constellation Bounds.renderable.enabled", false)
-    openspace.setPropertyValue("PlutoTrail.renderable.enabled", false)
-    openspace.setPropertyValue("PlutoTexture.renderable.enabled", false)
-
-    openspace.setPropertyValue("MilkyWay.renderable.transparency", 0.55)
-    openspace.setPropertyValue("MilkyWay.renderable.segments", 50)
-
-    openspace.printInfo("Done setting default values")
-end
-
-return {
-    ScenePath = ".",
-    CommonFolder = "common",
-    Camera = {
-        Focus = "Earth",
-        --Focus = "Moon",
-        Position = {526781518487.171326, 257168309890.072144, -1381125204152.817383},
-        Rotation = {-0.106166, 0.981574, -0.084545, 0.134513},
-    },
-    Modules = {
-        "sun",
-        "mercury",
-        "venus",
-        "earth",
-        "moon",
-        "mars",
-        --"jupiter",
-        "saturn",
-        "uranus",
-        "neptune",
-        "stars",
-        -- "stars-denver",
-        "milkyway",
-        -- "milkyway-eso",
-        --"constellationbounds",
-        -- "fieldlines",
-        --"io",
-        --"europa",
-        --"ganymede",
-        --"callisto",
-        --"gridGalactic",
-        --"gridEcliptic",
-        --"gridEquatorial",
-    }
-}
-

data/scene/default.scene

@@ -10,7 +10,7 @@ function preInitialization()
     openspace.spice.loadKernel("${SPICE}/pck00010.tpc")
 
     openspace.time.setTime(openspace.time.currentWallTime())
-    dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
+    dofile(openspace.absPath('${SCRIPTS}/bind_common_keys.lua'))
 
 end
 
@@ -21,7 +21,7 @@ function postInitialization()
     graphical settings for the renderables.
     ]]--
     openspace.printInfo("Setting default values")
-    openspace.setPropertyValue("Sun.renderable.enab`led", true)
+    openspace.setPropertyValue("Sun.renderable.enabled", true)
     openspace.setPropertyValue("SunGlare.renderable.enabled", false)
     openspace.setPropertyValue("SunMarker.renderable.enabled", false)
     openspace.setPropertyValue("EarthMarker.renderable.enabled", false)
@@ -35,17 +35,7 @@ function postInitialization()
     openspace.printInfo("Done setting default values")
 
     if openspace.modules.isLoaded("ISWA") then
-    
         openspace.iswa.addCdfFiles("${OPENSPACE_DATA}/cdflist.json");
-
-        --openspace.iswa.addCygnet(7);
-
-        --openspace.iswa.addCygnet(-4,"Data","Gm");
-        --openspace.iswa.addCygnet(-5,"Data","Gm");
-        --openspace.iswa.addCygnet(-6,"Data","Gm");
-        --openspace.iswa.addCygnet(-7,"Data","Gm");
-        --openspace.iswa.addCygnet(-8,"Data","Gm");
-        --openspace.iswa.addCygnet(-9,"Data","Gm");
     end
 end
 

data/scene/fieldlines.scene

@@ -10,7 +10,7 @@ function preInitialization()
     openspace.spice.loadKernel("${SPICE}/pck00010.tpc")
 
     openspace.time.setTime("2015 JAN 01 12:00:00.000")
-    dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
+    dofile(openspace.absPath('${SCRIPTS}/bind_common_keys.lua'))
 end
 
 function postInitialization()

data/scene/globebrowsing-debug.scene

@@ -1,46 +0,0 @@
-function preInitialization()
-    --[[
-    The scripts in this function are executed after the scene is loaded but before the
-    scene elements have been initialized, thus they should be used to set the time at
-    which the scene should start and other settings that might determine initialization
-    critical objects.
-    ]]--
-
-    --openspace.time.setTime(openspace.time.currentWallTime())
-    openspace.spice.loadKernel("${SPICE}/naif0011.tls")
-    openspace.spice.loadKernel("${SPICE}/pck00010.tpc")
-
-    openspace.time.setTime("2015 NOV 24 00:00:00")
-
-
-    dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
-end
-
-function postInitialization()
-    openspace.printInfo("Setting default values")
-
-    openspace.setInteractionMode('GlobeBrowsing')
-    
-    openspace.time.setDeltaTime(0)
-    openspace.restoreCameraStateFromFile("debugstart.view")
-    openspace.resetCameraDirection()
-    openspace.gui.show()
-
-    openspace.printInfo("Done setting default values")
-end
-
-
-return {
-    ScenePath = ".",
-    CommonFolder = "common",
-    Camera = {
-        Focus = "DebugGlobe",
-        Position = {3428016.852415, 616607.056698, 60430.587719},
-        Rotation = {0.178551, -0.280661, 0.916566, 0.221935},
-    },
-
-    Modules = {
-        "debugglobe"
-    }
-}
-

data/scene/globebrowsing.scene

@@ -10,43 +10,42 @@ function preInitialization()
     openspace.spice.loadKernel("${SPICE}/naif0011.tls")
     openspace.spice.loadKernel("${SPICE}/pck00010.tpc")
 
-    openspace.time.setTime("2015 NOV 24 00:00:00")
-
     openspace.time.setTime(openspace.time.currentWallTime())
-    dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
+    dofile(openspace.absPath('${SCRIPTS}/bind_common_keys.lua'))
 
 
-    -- Toggle trails
-    openspace.bindKey("t",
-        helper.property.invert('EarthTrail.renderable.enabled') ..
-        helper.property.invert('MarsTrail.renderable.enabled') ..
-        helper.property.invert('MoonTrail.renderable.enabled')
-    )
-
     -- Toggle night texture, shading, atmosphere and water
     openspace.bindKey("s",
         helper.property.invert('Earth.RenderableGlobe.Layers.NightLayers.Earth at Night 2012.enabled') ..
         helper.property.invert('Earth.RenderableGlobe.performShading') ..
         helper.property.invert('Earth.RenderableGlobe.atmosphere') ..
-        helper.property.invert('Earth.RenderableGlobe.Layers.WaterMasks.MODIS_Water_Mask.enabled')
+        helper.property.invert('Earth.RenderableGlobe.Layers.WaterMasks.MODIS_Water_Mask.enabled'),
+        "ssdasd"
     )
 
     -- Toggle background
     openspace.bindKey("b",
         helper.property.invert('MilkyWay.renderable.enabled') ..
-        helper.property.invert('Sun.renderable.enabled') ..
-        helper.property.invert('Moon.RenderableGlobe.enabled') ..
-        helper.property.invert('Mars.RenderableGlobe.enabled') ..
-        helper.property.invert('Stars.renderable.enabled')
+        helper.property.invert('Stars.renderable.enabled'),
+        "asdasd"
     )
 
+    --[[
+    -- Toggle trails
+    openspace.bindKey("o",
+        'openspace.setPropertyValue("*Trail.renderable.enabled", false)'
+    )
+    openspace.bindKey("p",
+        'openspace.setPropertyValue("*Trail.renderable.enabled", true)'
+    )
+    
+]]
 end
 
 function postInitialization()
     openspace.printInfo("Setting default values")
 
     openspace.setInteractionMode('GlobeBrowsing')
-    --openspace.restoreCameraStateFromFile("camera_lookat_planet.lua")
 
     openspace.setPropertyValue("MilkyWay.renderable.transparency", 0.55)
     openspace.setPropertyValue("MilkyWay.renderable.segments", 50)
@@ -60,7 +59,6 @@ function postInitialization()
     openspace.setPropertyValue("Earth.RenderableGlobe.Layers.NightLayers.Earth at Night 2012.settings.multiplier", 10)
 
     openspace.resetCameraDirection()
-    openspace.time.setDeltaTime(0)
 
     openspace.printInfo("Done setting default values")
 end

data/scene/juno.scene

@@ -9,7 +9,6 @@ function preInitialization()
     openspace.spice.loadKernel("${SPICE}/pck00010.tpc")
 
     openspace.time.setTime("2016-07-05T10:05:00.00")
-    openspace.time.setDeltaTime(0)
 
     dofile(openspace.absPath('${SCRIPTS}/common.lua'))
     openspace.clearKeys()
@@ -18,8 +17,6 @@ function preInitialization()
       1, 5, 10, 20, 40, 90, 360, 720, 2880, 14400,
         28800, 57600, 115200, 230400, 460800, 921600, 1843200, 3686400, 7372800, 14745600
     })
-
-    openspace.bindKey("F6", "openspace.setPropertyValue('Interaction.coordinateSystem', 'Jupiter');");
 end
 
 function postInitialization()
@@ -55,12 +52,12 @@ return {
         "earth",
         "mars",
         "jupiter",
-        "saturn",
+        "saturn/saturn",
         "uranus",
         "neptune",
         "stars",
         "milkyway",
-        "juno"
+        "missions/juno"
     }
 }
 

data/scene/mercury/mercury.mod

@@ -3,6 +3,14 @@ return {
     {
         Name = "MercuryBarycenter",
         Parent = "SolarSystemBarycenter",
+        Transform = {
+            Translation = {
+                Type = "SpiceTranslation",
+                Body = "MERCURY BARYCENTER",
+                Observer = "SUN",
+                Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
+            },
+        }
     },
     -- Mercury module
     {   
@@ -28,12 +36,6 @@ return {
             }
         },
         Transform = {
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "MERCURY",
-                Observer = "SUN",
-                Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
-            },
             Rotation = {
                 Type = "SpiceRotation",
                 SourceFrame = "IAU_MERCURY",
@@ -48,7 +50,7 @@ return {
     -- MercuryTrail module
     {   
         Name = "MercuryTrail",
-        Parent = "MercuryBarycenter",
+        Parent = "SolarSystemBarycenter",
         Renderable = {
             Type = "RenderableTrail",
             Body = "MERCURY",

data/scene/missions/juno/juno/juno.mod

@@ -1,144 +1,144 @@
-return {
-    -- New Horizons Body module
-    {   
-        Name = "Juno",
-        -- Parent = "PlutoBarycenter", 
-        -- Parent = "JupiterBarycenter", 
-        Parent = "JupiterBarycenter", 
-        Renderable = {
-            Type = "RenderableModel",
-            Body = "JUNO",
-            Geometry = {
-                Type = "MultiModelGeometry",
-                GeometryFile = "Juno.obj",
-                Magnification = 4,
-            }, 
-            Textures = {
-                Type = "simple",
-                Color =  "textures/gray.png",
-            },
-            Rotation = {
-                Source = "JUNO_SPACECRAFT",
-                Destination = "GALACTIC",
-                ModelTransform = {
-                    1.0, 0.0, 0.0,
-                    0.0, 0.0, 1.0,
-                    0.0, -1.0, 0.0
-                }
-            },
-        },
-
-        Ephemeris = {
-            Type = "Spice",
-            Body = "JUNO",
-            Observer = "JUPITER BARYCENTER",
-            Kernels = {
-                "spice/JNO_SCLKSCET.00039.tsc",
-                "spice/juno_jade_v00.ti",
-                "spice/juno_jedi_v00.ti",
-                "spice/juno_jiram_v01.ti",
-                "spice/juno_junocam_v00.ti",
-                "spice/juno_mag_v00.ti",
-                "spice/juno_mwr_v01.ti",
-                "spice/juno_struct_v01.ti",
-                "spice/juno_uvs_v00.ti",
-                "spice/juno_v08.tf",
-                "spice/juno_waves_v00.ti",
-                "spice/juno_mwr_v01.ti",
-                "spice/spk_merge_110805_171017_130515.bsp",
-                "spice/ck/juno_sc_prl_110930_111028_jc003c01_v01.bc",
-                "spice/ck/juno_sc_prl_111028_111125_jc004b00_v01.bc",
-                "spice/ck/juno_sc_prl_111125_111223_jc005b00_v01.bc",
-                "spice/ck/juno_sc_prl_111223_120127_jc006a02_v01.bc",
-                "spice/ck/juno_sc_prl_120127_120217_jc007a00_v01.bc",
-                "spice/ck/juno_sc_prl_120217_120316_jc008b00_v02.bc",
-                "spice/ck/juno_sc_prl_120316_120413_jc009a00_v01.bc",
-                "spice/ck/juno_sc_prl_120413_120511_jc010a04_v01.bc",
-                "spice/ck/juno_sc_prl_120511_120608_jc011a01_v02.bc",
-                "spice/ck/juno_sc_prl_120608_120706_jc012b01_v01.bc",
-                "spice/ck/juno_sc_prl_120706_120802_jc013a01_v01.bc",
-                "spice/ck/juno_sc_prl_120802_120824_jc014b01_v01.bc",
-                "spice/ck/juno_sc_prl_120824_120928_jc015m00_v01.bc",
-                "spice/ck/juno_sc_prl_120919_120928_jc015o00_v01.bc",
-                "spice/ck/juno_sc_prl_120928_121026_jc016c03_v01.bc",
-                "spice/ck/juno_sc_prl_121026_121123_jc017a01_v01.bc",
-                "spice/ck/juno_sc_prl_121123_121221_jc018b01_v01.bc",
-                "spice/ck/juno_sc_prl_121221_130118_jc019a01_v01.bc",
-                "spice/ck/juno_sc_prl_130118_130215_jc020b01_v01.bc",
-                "spice/ck/juno_sc_prl_130315_130412_jc022b01_v01.bc",
-                "spice/ck/juno_sc_prl_130412_130510_jc023b03_v01.bc",
-                "spice/ck/juno_sc_prl_130510_130607_jc024a01_v01.bc",
-                "spice/ck/juno_sc_prl_130607_130705_jc025a00_v01.bc",
-                "spice/ck/juno_sc_prl_130705_130802_jc026a01_v01.bc",
-                "spice/ck/juno_sc_prl_130726_131020_jx024a02_EFB_v03.bc",
-                "spice/ck/juno_sc_prl_130802_130830_jc027a02_v01.bc",
-                "spice/ck/juno_sc_prl_130830_130927_jc028a01_v01.bc",
-                "spice/ck/juno_sc_prl_130926_131025_jc029a00_v01.bc",
-                "spice/ck/juno_sc_prl_130927_131025_jc029c01_v01.bc",
-                "spice/ck/juno_sc_prl_131022_131025_jc029f00_v01.bc",
-                "spice/ck/juno_sc_prl_131025_131122_jc030b04_v01.bc",
-                "spice/ck/juno_sc_prl_131122_131220_jc031b01_v01.bc",
-                "spice/ck/juno_sc_prl_131220_140124_jc032a01_v01.bc",
-                "spice/ck/juno_sc_prl_140124_140214_jc033a01_v01.bc",
-                "spice/ck/juno_sc_prl_140214_140314_jc034b01_v01.bc",
-                "spice/ck/juno_sc_prl_140314_140411_jc035a01_v01.bc",
-                "spice/ck/juno_sc_prl_140411_140509_jc036b01_v01.bc",
-                "spice/ck/juno_sc_prl_140509_140606_jc037b02_v01.bc",
-                "spice/ck/juno_sc_prl_140606_140704_jc038a01_v01.bc",
-                "spice/ck/juno_sc_prl_140704_140801_jc039b01_v01.bc",
-                "spice/ck/juno_sc_prl_140801_140829_jc040a01_v01.bc",
-                "spice/ck/juno_sc_prl_140829_140926_jc041a01_v01.bc",
-                "spice/ck/juno_sc_prl_140926_141024_jc042a01_v01.bc",
-                "spice/ck/juno_sc_prl_141024_141121_jc043a01_v01.bc",
-                "spice/ck/juno_sc_prl_141105_141121_jc043m01_v01.bc",
-                "spice/ck/juno_sc_prl_141107_141121_jc043s01_v01.bc",
-                "spice/ck/juno_sc_prl_141121_141219_jc044a01_v01.bc",
-                "spice/ck/juno_sc_prl_141219_150123_jc045a01_v01.bc",
-                "spice/ck/juno_sc_prl_150123_150213_jc046a01_v01.bc",
-                "spice/ck/juno_sc_prl_150213_150313_jc047a01_v01.bc",
-                "spice/ck/juno_sc_prl_150312_150409_jc048a01_v01.bc",
-                "spice/ck/juno_sc_prl_150410_150508_jc049a01_v01.bc",
-                "spice/ck/juno_sc_prl_150508_150605_jc050a01_v01.bc",
-                "spice/ck/juno_sc_prl_150605_150703_jc051a01_v01.bc",
-                "spice/ck/juno_sc_prl_150703_150731_jc052a01_v01.bc",
-                "spice/ck/juno_sc_prl_150731_150828_jc053a01_v01.bc",
-                "spice/ck/juno_sc_prl_150805_150828_jc053m00_v01.bc",
-                "spice/ck/juno_sc_prl_150807_150828_jc053s00_v01.bc",
-                "spice/ck/juno_sc_prl_150828_150924_jc054a00_v01.bc",
-                "spice/ck/juno_sc_prl_150924_151023_jc055a00_v01.bc",
-                "spice/ck/juno_sc_prl_151023_151120_jc056a00_v01.bc",
-                "spice/ck/juno_sc_prl_151120_151218_jc057a00_v01.bc",
-                "spice/ck/juno_sc_prl_151218_160115_jc058a00_v01.bc",
-                "spice/ck/juno_sc_prl_160115_160212_jc059a00_v01.bc",
-                "spice/ck/juno_sc_prl_160212_160311_jc060a00_v01.bc",
-                "spice/ck/juno_sc_prl_160311_160408_jc061a00_v01.bc",
-                "spice/ck/juno_sc_prl_160408_160506_jc062a00_v01.bc",
-                "spice/ck/juno_sc_prl_160506_160603_jc063a00_v01.bc",
-                "spice/ck/juno_sc_prl_160603_160630_jc064a00_v01.bc",
-                "spice/ck/juno_sc_prl_160708_160729_jm0001rp_v02.bc",
-                "spice/ck/juno_sc_prl_160729_160826_jm0002rp_v01.bc",
-                "spice/ck/juno_sc_prl_161115_161213_jx0405rp_v01.bc"
-            }
-        }
-    },
-    --NewHorizonsTrail module
-    {   
-        Name = "JunoTrail",
-        Parent = "JupiterBarycenter",
-        Renderable = {
-            Type = "RenderableTrail",
-            Body = "JUNO",
-            Frame = "GALACTIC",
-            Observer = "JUPITER BARYCENTER",
-            RGB = { 0.70,0.50,0.20 },
-            TropicalOrbitPeriod = 394250.0,
-            EarthOrbitRatio = 4.5,
-            DayLength = 9.9259,
-            TimeStamps = false,
-            Textures = {
-                Type = "simple",
-                Color = "textures/glare_blue.png",
-            },  
-        },
-    },
-    }
+return {
+    -- New Horizons Body module
+    {   
+        Name = "Juno",
+        -- Parent = "PlutoBarycenter", 
+        -- Parent = "JupiterBarycenter", 
+        Parent = "JupiterBarycenter", 
+        Renderable = {
+            Type = "RenderableModel",
+            Body = "JUNO",
+            Geometry = {
+                Type = "MultiModelGeometry",
+                GeometryFile = "Juno.obj",
+                Magnification = 4,
+            }, 
+            Textures = {
+                Type = "simple",
+                Color =  "textures/gray.png",
+            },
+            Rotation = {
+                Source = "JUNO_SPACECRAFT",
+                Destination = "GALACTIC",
+                ModelTransform = {
+                    1.0, 0.0, 0.0,
+                    0.0, 0.0, 1.0,
+                    0.0, -1.0, 0.0
+                }
+            },
+        },
+
+        Ephemeris = {
+            Type = "Spice",
+            Body = "JUNO",
+            Observer = "JUPITER BARYCENTER",
+            Kernels = {
+                "spice/JNO_SCLKSCET.00039.tsc",
+                "spice/juno_jade_v00.ti",
+                "spice/juno_jedi_v00.ti",
+                "spice/juno_jiram_v01.ti",
+                "spice/juno_junocam_v00.ti",
+                "spice/juno_mag_v00.ti",
+                "spice/juno_mwr_v01.ti",
+                "spice/juno_struct_v01.ti",
+                "spice/juno_uvs_v00.ti",
+                "spice/juno_v08.tf",
+                "spice/juno_waves_v00.ti",
+                "spice/juno_mwr_v01.ti",
+                "spice/spk_merge_110805_171017_130515.bsp",
+                "spice/ck/juno_sc_prl_110930_111028_jc003c01_v01.bc",
+                "spice/ck/juno_sc_prl_111028_111125_jc004b00_v01.bc",
+                "spice/ck/juno_sc_prl_111125_111223_jc005b00_v01.bc",
+                "spice/ck/juno_sc_prl_111223_120127_jc006a02_v01.bc",
+                "spice/ck/juno_sc_prl_120127_120217_jc007a00_v01.bc",
+                "spice/ck/juno_sc_prl_120217_120316_jc008b00_v02.bc",
+                "spice/ck/juno_sc_prl_120316_120413_jc009a00_v01.bc",
+                "spice/ck/juno_sc_prl_120413_120511_jc010a04_v01.bc",
+                "spice/ck/juno_sc_prl_120511_120608_jc011a01_v02.bc",
+                "spice/ck/juno_sc_prl_120608_120706_jc012b01_v01.bc",
+                "spice/ck/juno_sc_prl_120706_120802_jc013a01_v01.bc",
+                "spice/ck/juno_sc_prl_120802_120824_jc014b01_v01.bc",
+                "spice/ck/juno_sc_prl_120824_120928_jc015m00_v01.bc",
+                "spice/ck/juno_sc_prl_120919_120928_jc015o00_v01.bc",
+                "spice/ck/juno_sc_prl_120928_121026_jc016c03_v01.bc",
+                "spice/ck/juno_sc_prl_121026_121123_jc017a01_v01.bc",
+                "spice/ck/juno_sc_prl_121123_121221_jc018b01_v01.bc",
+                "spice/ck/juno_sc_prl_121221_130118_jc019a01_v01.bc",
+                "spice/ck/juno_sc_prl_130118_130215_jc020b01_v01.bc",
+                "spice/ck/juno_sc_prl_130315_130412_jc022b01_v01.bc",
+                "spice/ck/juno_sc_prl_130412_130510_jc023b03_v01.bc",
+                "spice/ck/juno_sc_prl_130510_130607_jc024a01_v01.bc",
+                "spice/ck/juno_sc_prl_130607_130705_jc025a00_v01.bc",
+                "spice/ck/juno_sc_prl_130705_130802_jc026a01_v01.bc",
+                "spice/ck/juno_sc_prl_130726_131020_jx024a02_EFB_v03.bc",
+                "spice/ck/juno_sc_prl_130802_130830_jc027a02_v01.bc",
+                "spice/ck/juno_sc_prl_130830_130927_jc028a01_v01.bc",
+                "spice/ck/juno_sc_prl_130926_131025_jc029a00_v01.bc",
+                "spice/ck/juno_sc_prl_130927_131025_jc029c01_v01.bc",
+                "spice/ck/juno_sc_prl_131022_131025_jc029f00_v01.bc",
+                "spice/ck/juno_sc_prl_131025_131122_jc030b04_v01.bc",
+                "spice/ck/juno_sc_prl_131122_131220_jc031b01_v01.bc",
+                "spice/ck/juno_sc_prl_131220_140124_jc032a01_v01.bc",
+                "spice/ck/juno_sc_prl_140124_140214_jc033a01_v01.bc",
+                "spice/ck/juno_sc_prl_140214_140314_jc034b01_v01.bc",
+                "spice/ck/juno_sc_prl_140314_140411_jc035a01_v01.bc",
+                "spice/ck/juno_sc_prl_140411_140509_jc036b01_v01.bc",
+                "spice/ck/juno_sc_prl_140509_140606_jc037b02_v01.bc",
+                "spice/ck/juno_sc_prl_140606_140704_jc038a01_v01.bc",
+                "spice/ck/juno_sc_prl_140704_140801_jc039b01_v01.bc",
+                "spice/ck/juno_sc_prl_140801_140829_jc040a01_v01.bc",
+                "spice/ck/juno_sc_prl_140829_140926_jc041a01_v01.bc",
+                "spice/ck/juno_sc_prl_140926_141024_jc042a01_v01.bc",
+                "spice/ck/juno_sc_prl_141024_141121_jc043a01_v01.bc",
+                "spice/ck/juno_sc_prl_141105_141121_jc043m01_v01.bc",
+                "spice/ck/juno_sc_prl_141107_141121_jc043s01_v01.bc",
+                "spice/ck/juno_sc_prl_141121_141219_jc044a01_v01.bc",
+                "spice/ck/juno_sc_prl_141219_150123_jc045a01_v01.bc",
+                "spice/ck/juno_sc_prl_150123_150213_jc046a01_v01.bc",
+                "spice/ck/juno_sc_prl_150213_150313_jc047a01_v01.bc",
+                "spice/ck/juno_sc_prl_150312_150409_jc048a01_v01.bc",
+                "spice/ck/juno_sc_prl_150410_150508_jc049a01_v01.bc",
+                "spice/ck/juno_sc_prl_150508_150605_jc050a01_v01.bc",
+                "spice/ck/juno_sc_prl_150605_150703_jc051a01_v01.bc",
+                "spice/ck/juno_sc_prl_150703_150731_jc052a01_v01.bc",
+                "spice/ck/juno_sc_prl_150731_150828_jc053a01_v01.bc",
+                "spice/ck/juno_sc_prl_150805_150828_jc053m00_v01.bc",
+                "spice/ck/juno_sc_prl_150807_150828_jc053s00_v01.bc",
+                "spice/ck/juno_sc_prl_150828_150924_jc054a00_v01.bc",
+                "spice/ck/juno_sc_prl_150924_151023_jc055a00_v01.bc",
+                "spice/ck/juno_sc_prl_151023_151120_jc056a00_v01.bc",
+                "spice/ck/juno_sc_prl_151120_151218_jc057a00_v01.bc",
+                "spice/ck/juno_sc_prl_151218_160115_jc058a00_v01.bc",
+                "spice/ck/juno_sc_prl_160115_160212_jc059a00_v01.bc",
+                "spice/ck/juno_sc_prl_160212_160311_jc060a00_v01.bc",
+                "spice/ck/juno_sc_prl_160311_160408_jc061a00_v01.bc",
+                "spice/ck/juno_sc_prl_160408_160506_jc062a00_v01.bc",
+                "spice/ck/juno_sc_prl_160506_160603_jc063a00_v01.bc",
+                "spice/ck/juno_sc_prl_160603_160630_jc064a00_v01.bc",
+                "spice/ck/juno_sc_prl_160708_160729_jm0001rp_v02.bc",
+                "spice/ck/juno_sc_prl_160729_160826_jm0002rp_v01.bc",
+                "spice/ck/juno_sc_prl_161115_161213_jx0405rp_v01.bc"
+            }
+        }
+    },
+    --NewHorizonsTrail module
+    {   
+        Name = "JunoTrail",
+        Parent = "JupiterBarycenter",
+        Renderable = {
+            Type = "RenderableTrail",
+            Body = "JUNO",
+            Frame = "GALACTIC",
+            Observer = "JUPITER BARYCENTER",
+            RGB = { 0.70,0.50,0.20 },
+            TropicalOrbitPeriod = 394250.0,
+            EarthOrbitRatio = 4.5,
+            DayLength = 9.9259,
+            TimeStamps = false,
+            Textures = {
+                Type = "simple",
+                Color = "textures/glare_blue.png",
+            },  
+        },
+    },
+    }

data/scene/missions/newhorizons/jupiter/jupiter/jupiter.mod

@@ -33,7 +33,7 @@ return {
             },
             Projection = {
                 --Sequence   = "F:/JupiterFullSequence",
-                Sequence   = "${OPENSPACE_DATA}/scene/newhorizons/jupiter/jupiter/ProjectionsOfInterest",
+                Sequence   = "${OPENSPACE_DATA}/scene/missions/newhorizons/jupiter/jupiter/ProjectionsOfInterest",
                 SequenceType = "image-sequence",
                 Observer   = "NEW HORIZONS",
                 Target     = "JUPITER",

data/scene/missions/newhorizons/newhorizons/newhorizons.mod

@@ -172,8 +172,7 @@ return {
             },
         }
     },
-
-    {   
+    {
         Name = "NewHorizonsTrailPluto",
         Parent = "PlutoBarycenter",
         Renderable = {

data/scene/missions/newhorizons/pluto/pluto/pluto.mod

@@ -46,8 +46,8 @@ return {
                 Height = "textures/pluto_shenk_heightmap.jpg",
             },
             Projection = {
-                Sequence       = "${OPENSPACE_DATA}/scene/newhorizons/pluto/pluto/images",
-                EventFile      = "${OPENSPACE_DATA}/scene/newhorizons/pluto/pluto/assets/core_v9h_obs_getmets_v8_time_fix_nofrcd_mld.txt",
+                Sequence       = "${OPENSPACE_DATA}/scene/missions/newhorizons/pluto/pluto/images",
+                EventFile      = "${OPENSPACE_DATA}/scene/missions/newhorizons/pluto/pluto/assets/core_v9h_obs_getmets_v8_time_fix_nofrcd_mld.txt",
                 SequenceType   = "hybrid",
                 Observer       = "NEW HORIZONS",
                 Target         = "PLUTO",

data/scene/missions/osirisrex/bennu/bennu.mod

@@ -16,7 +16,7 @@ return {
         },
     },
     {   
-        Name = "Bennu2",
+        Name = "Bennu",
         Parent = "BennuBarycenter",
 
         Renderable = {

data/scene/missions/osirisrex/osirisrex/osirisrex.mod

@@ -0,0 +1,422 @@
+local BENNU_BODY = "2101955"
+
+local CaseDependentKernels
+if KernelCase == 2 then
+    CaseDependentKernels = {
+        "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/525m_Sortie_v2/ORX_Recon_525mSortie_Case02.bsp",
+        "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/525m_Sortie_v2/Recon_525mSortie_Case02_0Latitude.bc",
+        "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/525m_Sortie_v2/Recon_525mSortie_Case02_atl_19145_04.atf",
+
+        "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/ORX_Recon_225mSortie_Case02.bsp",
+        "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/Recon_225mSortie_Case02_0Latitude.bc"
+    }
+elseif KernelCase == 5 then
+    CaseDependentKernels = {
+        "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/525m_Sortie_v2/ORX_Recon_525mSortie_Case05.bsp",
+        "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/525m_Sortie_v2/Recon_525mSortie_Case05_20negLatitude.bc",
+        "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/525m_Sortie_v2/Recon_525mSortie_Case05_atl_19145_04.atf",
+        "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/525m_Sortie_v2/Recon_525mSortie_Case05_NominalProfile.bc",
+
+        "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/ORX_Recon_225mSortie_Case05.bsp",
+        "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/Recon_225mSortie_Case05_20negLatitude.bc"
+    }
+elseif KernelCase == 8 then
+    CaseDependentKernels = {
+        "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/525m_Sortie_v2/Recon_525mSortie_Case08_NominalProfile.bc",
+        "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/ORX_Recon_225mSortie_Case08.bsp",
+        "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/Recon_225mSortie_Case08_40negLatitude.bc"
+    }
+elseif KernelCase == 11 then
+    CaseDependentKernels = {
+        "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/ORX_Recon_225mSortie_Case11.bsp",
+        "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/Recon_225mSortie_Case11_60negLatitude.bc"
+    }
+end
+
+local OsirisRexKernels = {
+    -- background 
+    -- SCLK kernels needs to be loaded before CK kernels (and generally first)
+    "${SPICE}/OsirisRexKernels/background/sclk/ORX_SCLKSCET.00000.tsc",
+
+    -- This cannot be loaded correctly for some reason!
+    --openspace.spice.loadKernel("${SPICE}/OsirisRexKernels/background/dsk/RQ36mod.oct12_CCv0001.bds")
+    
+    "${SPICE}/OsirisRexKernels/background/fk/orx_v04.tf",
+    "${SPICE}/OsirisRexKernels/background/ik/orx_lidar_v00.ti",
+    "${SPICE}/OsirisRexKernels/background/ik/orx_ocams_v03.ti",
+    "${SPICE}/OsirisRexKernels/background/ik/orx_otes_v00.ti",
+    "${SPICE}/OsirisRexKernels/background/ik/orx_rexis_v00.ti",
+    "${SPICE}/OsirisRexKernels/background/ik/orx_struct_v00.ti",
+    "${SPICE}/OsirisRexKernels/background/ik/orx_navcam_v00.ti",
+    "${SPICE}/OsirisRexKernels/background/ik/orx_ola_v00.ti",
+    "${SPICE}/OsirisRexKernels/background/ik/orx_ovirs_v00.ti",
+    "${SPICE}/OsirisRexKernels/background/ik/orx_stowcam_v00.ti",
+    "${SPICE}/OsirisRexKernels/background/lsk/naif0011.tls",
+    "${SPICE}/OsirisRexKernels/background/pck/bennu_SPH250m.tpc",
+    "${SPICE}/OsirisRexKernels/background/pck/bennu_v10.tpc",
+
+    -- Low res SPK
+    "${SPICE}/OsirisRexKernels/background/spk/orx_160917_231024_pgaa3_day15m60_v1.bsp",
+    "${SPICE}/OsirisRexKernels/background/spk/orx_160914_231024_pgaa3_day12m60_v1.bsp",
+    
+    "${SPICE}/OsirisRexKernels/background/spk/orx_160908_231024_pgaa3_day06m60_v1.bsp",
+    "${SPICE}/OsirisRexKernels/background/spk/spk_orx_160908_231024_pgaa2_day06m60_v3.bsp",
+    "${SPICE}/OsirisRexKernels/background/spk/orx_160908_231024_pgaa2_day06m60.bsp",
+
+    "${SPICE}/OsirisRexKernels/background/spk/OREX_20160908_M60_complete.bsp",
+    "${SPICE}/OsirisRexKernels/background/spk/OREX_20160904_M45_complete.bsp",
+
+    -- SPK
+    "${SPICE}/OsirisRexKernels/background/spk/de421.bsp",
+    "${SPICE}/OsirisRexKernels/background/spk/sb-101955-76.bsp",
+
+    -- Nominal_Profile_LowRes
+    "${SPICE}/OsirisRexKernels/Nominal_Profile_LowRes/Approach_600s_20180816T230000_20181119T010000.bsp",
+    "${SPICE}/OsirisRexKernels/Nominal_Profile_LowRes/Approach_NominalProfile_600s_20180816T230000_20181119T010000.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Profile_LowRes/DetailedSurvey_600s_20190108T000000_20190317T000000.bsp",
+    "${SPICE}/OsirisRexKernels/Nominal_Profile_LowRes/OrbitalA_600s_20181203T230000_20190109T000000.bsp",
+    "${SPICE}/OsirisRexKernels/Nominal_Profile_LowRes/OrbitalA_NominalProfile_600s_20181203T230000_20190109T000000.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Profile_LowRes/OrbitalB_600s_20190316T000000_20190521T000000.bsp",
+    "${SPICE}/OsirisRexKernels/Nominal_Profile_LowRes/DetailedSurvey_NominalProfile_600s_20190108T000000_20190317T000000.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Profile_LowRes/OrbitalB_NominalProfile600s_20190316T000000_20190521T000000.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Profile_LowRes/PrelimSurvey_600s_20181119T230000_20181204T010000.bsp",
+    "${SPICE}/OsirisRexKernels/Nominal_Profile_LowRes/PrelimSurvey_NominalProfile_600s_20181119T230000_20181204T010000.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Profile_LowRes/Recon_600s_20190519T000000_20190830T000000.bsp",
+    "${SPICE}/OsirisRexKernels/Nominal_Profile_LowRes/Recon_NominalProfile_600s_20190519T000000_20190830T000000.bc",
+    
+    -- Nominal_Observations_Science
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/03_Approach/DustSearch_v1/Phase03_AP_DustSearch_1.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/03_Approach/LightCurve_v1/Phase03_AP_LightCurve_1.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/03_Approach/LightCurve_v1/Phase03_AP_LightCurve_2.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/03_Approach/NatSatSearch_v1/Phase03_AP_SatSearch_1.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/03_Approach/NatSatSearch_v1/Phase03_AP_SatSearch_2.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/03_Approach/PhaseFunction_v1/Phase03_AP_PhaseFunction_1.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/03_Approach/ShapeModel_v1/Phase03_AP_ShapeModel_1.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/03_Approach/ShapeModel_v1/Phase03_AP_ShapeModel_2.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/03_Approach/ShapeModel_v1/Phase03_AP_ShapeModel_3.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/03_Approach/ShapeModel_v1/Phase03_AP_ShapeModel_4.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/03_Approach/ShapeModel_v1/Phase03_AP_ShapeModel_5.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/03_Approach/ShapeModel_v1/Phase03_AP_ShapeModel_6.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/03_Approach/ShapeModel_v1/Phase03_AP_ShapeModel_7.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/03_Approach/ShapeModel_v1/Phase03_AP_ShapeModel_8.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/03_Approach/ShapeModel_v1/Phase03_AP_ShapeModel_9_Forced4x4.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/03_Approach/SpectraMap_v1/Phase03_AP_SpectraMap_1.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/MapCamOLA_v1/Phase04_PS_MC_1_v1_1a.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/MapCamOLA_v1/Phase04_PS_MC_2_v1_1a.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/OLA_v1/Phase04_PS_OLA_Nominal_1.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/OLA_v1/Phase04_PS_OLA_Nominal_2.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/OLA_v1/Phase04_PS_OLA_Nominal_3.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/OLA_v1/Phase04_PS_OLA_Nominal_4.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/PolyCam_v1/Phase04_PS_PolyCam_1.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/PolyCam_v1/Phase04_PS_PolyCam_2.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/PolyCam_v1/Phase04_PS_PolyCam_3.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/PolyCam_v1/Phase04_PS_PolyCam_4.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/PolyCam_v1/Phase04_PS_PolyCam_5.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/PolyCam_v1/Phase04_PS_PolyCam_6.bc",
+
+    --openspace.spice.loadKernel("${SPICE}/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19013_18_BBD1_info.TXT")
+    --openspace.spice.loadKernel("${SPICE}/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19014_16_BBD2_info.TXT")
+    --openspace.spice.loadKernel("${SPICE}/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19020_18_BBD3_info.TXT")
+    --openspace.spice.loadKernel("${SPICE}/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19021_19_BBD4_info.TXT")
+    --openspace.spice.loadKernel("${SPICE}/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/README.txt")
+    
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19013_18_BBD1_v2.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19014_16_BBD2_v2.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19020_18_BBD3_v2.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19021_19_BBD4_v2.bc",
+    
+
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/EquatorialStations_v1/Phase06_DS_Equatorial_Stations_1.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/EquatorialStations_v1/Phase06_DS_Equatorial_Stations_2.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/EquatorialStations_v1/Phase06_DS_Equatorial_Stations_3.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/EquatorialStations_v1/Phase06_DS_Equatorial_Stations_4.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/EquatorialStations_v1/Phase06_DS_Equatorial_Stations_5.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/EquatorialStations_v1/Phase06_DS_Equatorial_Stations_6.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/EquatorialStations_v1/Phase06_DS_Equatorial_Stations_7.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/PlumeSearch_v1/Phase06_DS_Plume_Search_1.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/PlumeSearch_v1/Phase06_DS_Plume_Search_2.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/07_OrbitalB/CandidateSampleSite_v1/Phase07_OB_CSS_Mapping_1.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/07_OrbitalB/CandidateSampleSite_v1/Phase07_OB_CSS_Mapping_2.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/07_OrbitalB/CandidateSampleSite_v1/Phase07_OB_CSS_Mapping_3.bc",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/07_OrbitalB/CandidateSampleSite_v2/CSS_Mapping_1.a",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/07_OrbitalB/CandidateSampleSite_v2/CSS_Mapping_2.a",
+    "${SPICE}/OsirisRexKernels/Nominal_Observations_Science/07_OrbitalB/CandidateSampleSite_v2/CSS_Mapping_3.a",
+
+    --openspace.spice.loadKernel("${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/Case02_0Latitude.wmv")
+    --openspace.spice.loadKernel("${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/Case05_20negLatitude.wmv")
+    --openspace.spice.loadKernel("${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/Case08_40negLatitude.wmv")
+    --openspace.spice.loadKernel("${SPICE}/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/Case11_60negLatitude.wmv")
+
+    KernelCase
+}
+
+
+return {
+    ------------------------
+    --     Osiris Rex     --
+    ------------------------
+    {
+        Name = "OsirisRex",
+        Parent = "SolarSystemBarycenter",
+        Renderable = {
+            Type = "RenderableModel",
+            Body = "OSIRIS-REX",
+            Geometry = {
+                Type = "MultiModelGeometry",
+                GeometryFile = "models/orx_base_resized_12_sep_2016.obj",
+                Magnification = 0,
+            },
+            Textures = {
+                Type = "simple",
+                Color =  "textures/osirisTex.png",
+            },
+            Shading = {
+                PerformShading = true,
+                Fadeable = false,
+                Ghosting = false,
+            },
+        },
+        Transform = {
+            Translation = {
+                Type = "SpiceTranslation",
+                Body = "OSIRIS-REX",
+                Observer = "SUN",
+                Kernels = OsirisRexKernels
+            },
+            Rotation = {
+                Type = "SpiceRotation",
+                SourceFrame = "ORX_SPACECRAFT",
+                DestinationFrame = "GALACTIC",
+            },
+        },
+    },
+    {
+        Name = "ORX_OCAMS_POLYCAM",
+        Parent = "OsirisRex",
+        Renderable = {
+            Type = "RenderableModel",
+            Body = "OSIRIS-REX",
+            Geometry = {
+                Type = "MultiModelGeometry",
+                GeometryFile = "models/orx_polycam_resized_12_sep_2016.obj",
+                Magnification = 0,
+            }, 
+            Textures = {
+                Type = "simple",
+                Color =  "textures/osirisTex.png",
+            },
+            Shading = {
+                PerformShading = true,
+                Fadeable = false,
+                Ghosting = false,
+            },
+        },
+        Transform = {
+            Translation = {
+                Type = "StaticTranslation",
+                Position = {-0.2476, 0.2710, 0.3364},
+            },
+            Rotation = {
+                Type = "SpiceRotation",
+                SourceFrame = "ORX_OCAMS_POLYCAM",
+                DestinationFrame = "ORX_SPACECRAFT",
+            },
+        },
+    },
+    {
+        Name = "ORX_REXIS",
+        Parent = "OsirisRex",
+        Renderable = {
+            Type = "RenderableModel",
+            Body = "OSIRIS-REX",
+            Geometry = {
+                Type = "MultiModelGeometry",
+                GeometryFile = "models/orx_rexis_resized_12_sep_2016.obj",
+                Magnification = 0,
+            }, 
+            Textures = {
+                Type = "simple",
+                Color =  "textures/osirisTex.png",
+            },
+            Shading = {
+                PerformShading = true,
+                Fadeable = false,
+                Ghosting = false,
+            },
+        },
+        Transform = {
+            Translation = {
+                Type = "StaticTranslation",
+                Position = {0, 0.3371, 0.2712},
+            },
+            Rotation = {
+                Type = "SpiceRotation",
+                SourceFrame = "ORX_REXIS",
+                DestinationFrame = "ORX_SPACECRAFT",
+            },
+        },
+    },
+    {
+        Name = "POLYCAM FOV",
+        Parent = "ORX_OCAMS_POLYCAM",
+        Renderable = {
+            Type  = "RenderableFov",
+            Body  = "OSIRIS-REX",
+            Frame = "ORX_OCAMS_POLYCAM",
+            RGB   = { 0.8, 0.7, 0.7 },
+            Instrument = {
+                Name       = "ORX_OCAMS_POLYCAM",
+                Method     = "ELLIPSOID",
+                Aberration = "NONE",
+            },
+            PotentialTargets = {
+                BENNU_BODY -- Bennu
+            }
+        },
+    },
+    { 
+        Name = "REXIS FOV",
+        Parent = "ORX_REXIS",
+        Renderable = {
+            Type  = "RenderableFov",
+            Body  = "OSIRIS-REX",
+            Frame = "ORX_REXIS",
+            RGB   = { 0.8, 0.7, 0.7 },
+            Instrument = {
+                Name       = "ORX_REXIS",
+                Method     = "ELLIPSOID",
+                Aberration = "NONE",
+            },
+            PotentialTargets = {
+                BENNU_BODY -- Bennu
+            },
+            FrameConversions = {
+                [BENNU_BODY] = "IAU_BENNU"
+            }
+        },
+    },
+    --[[
+    -- Latest image taken by POLYCAM
+    { 
+        Name = "ImagePlaneOsirisRex",
+        Parent = "Bennu2",
+        Renderable = {
+            Type = "RenderablePlaneProjection",
+            Frame = "IAU_BENNU",
+            DefaultTarget = BENNU_BODY,
+            Spacecraft = "OSIRIS-REX",
+            Instrument = "ORX_OCAMS_POLYCAM",
+            Moving = false,
+            Texture = "textures/defaultProj.png",
+        },
+        Ephemeris = {
+            Type = "Static",
+            Position = {0, 0, 0, 1}
+        }, 
+    },
+    -- POLYCAM FoV square
+    {
+        Name = "FovImagePlane",
+        Parent = "Bennu2",
+        Renderable = {
+            Type = "RenderablePlaneProjection",
+            Frame = "IAU_BENNU",
+            DefaultTarget = BENNU_BODY,
+            Spacecraft = "OSIRIS-REX",
+            Instrument = "ORX_OCAMS_POLYCAM",
+            Moving = true,
+            Texture = "textures/defaultProj.png",
+        },
+        Ephemeris = {
+            Type = "Static",
+            Position = {0, 0, 0, 1}
+        },
+    },
+    ]]
+
+    -- Trail relative to Earth
+    {   
+        Name = "OsirisRexTrailEarth",
+        Parent = "Earth",
+        Renderable = {
+            Type = "RenderableTrailNew",
+            -- Spice
+            Body = "OSIRIS-REX",
+            Frame = "IAU_EARTH",
+            Observer = "EARTH",
+            -- Optional rendering properties
+            LineColor = { 0.9, 0.9, 0.0 },
+            PointColor = { 0.9, 0.9, 0.0 },
+            LineFade = 0.0, -- [0,1]
+            RenderPart = 1,
+            LineWidth = 2,
+            ShowTimeStamps = false,
+            RenderFullTrail = false,
+            -- Time interval
+            TimeRange = {
+                Start = "2016 SEP 8 23:05:00.50",
+                End = "2016 SEP 9 00:05:00",
+            },
+            SampleDeltaTime = 60, -- Seconds between each point
+            SubSamples = 59, 
+        },
+    },
+
+    -- Trail relative to solar system barycenter
+    {   
+        Name = "OsirisRexTrailSolarSystem",
+        Parent = "SolarSystemBarycenter",
+        Renderable = {
+            Type = "RenderableTrailNew",
+            -- Spice
+            Body = "OSIRIS-REX",
+            Frame = "GALACTIC",
+            Observer = "SUN",
+            -- Optional rendering properties
+            LineColor = { 0.2, 0.9, 0.2 },
+            PointColor = { 0.2, 0.9, 0.2 },
+            LineFade = 0.0, -- [0,1]
+            RenderPart = 0.13,
+            LineWidth = 2,
+            ShowTimeStamps = false,
+            RenderFullTrail = false,
+            -- Time interval
+            TimeRange = {
+                Start = "2016 SEP 8 23:05:00.50",
+                End = "2023 SEP 24 12:00:00",
+            },
+            SampleDeltaTime = 3600, -- Seconds between each point
+            SubSamples = 0, 
+        },
+    },
+
+    -- Trail relative to Bennu
+    {   
+        Name = "OsirisRexTrailBennu",
+        Parent = "BennuBarycenter",
+        Renderable = {
+            Type = "RenderableTrailNew",
+            -- Spice
+            Body = "OSIRIS-REX",
+            Frame = "GALACTIC",
+            Observer = BENNU_BODY,
+            -- Optional rendering properties
+            LineColor = { 0.9, 0.2, 0.9 },
+            PointColor = { 0.9, 0.2, 0.9 },
+            LineFade = 0.5, -- [0,1]
+            RenderPart = 0.06,
+            LineWidth = 2,
+            ShowTimeStamps = false,
+            RenderFullTrail = false,
+            -- Time interval
+            TimeRange = {
+                Start = "2016 SEP 8 23:05:00.50",
+                End = "2023 SEP 24 12:00:00",
+            },
+            SampleDeltaTime = 3600, -- Seconds between each point
+            SubSamples = 3, 
+        },
+    },
+
+
+}