diff --git a/.gitignore b/.gitignore
index 1006d42b46..eed900b2fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,7 +73,14 @@ data/scene/osirisrex/bennu/textures
 data/scene/osirisrex/osirisrex/models
 data/scene/osirisrex/osirisrex/textures
 data/scene/pluto/textures
-data/scene/saturn/textures
+data/scene/saturn/dione/textures
+data/scene/saturn/enceladus/textures
+data/scene/saturn/iapetus/textures
+data/scene/saturn/mimas/textures
+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
@@ -90,11 +97,11 @@ data/scene/uranus/textures
 data/scene/venus/textures
 data/scene/volumetricmilkyway/milkyway
 data/spice/DawnKernels
-data/spice/jup260.bsp
 data/spice/de430_1850-2150.bsp
+data/spice/jup260.bsp
 data/spice/MAR063.BSP
 data/spice/NewHorizonsKernels
 data/spice/nh_kernels
 data/spice/OsirisRexKernels
 data/spice/Rosetta
-
+data/spice/sat375.bsp
diff --git a/data/scene/jupiter/europa/europa.mod b/data/scene/jupiter/europa/europa.mod
index e4dc06dcbc..38d973e463 100644
--- a/data/scene/jupiter/europa/europa.mod
+++ b/data/scene/jupiter/europa/europa.mod
@@ -33,11 +33,7 @@ return {
                 Type = "SpiceRotation",
                 SourceFrame = "IAU_EUROPA",
                 DestinationFrame = "IAU_JUPITER",
-            },
-            Scale = {
-                Type = "StaticScale",
-                Scale = 1,
-            },
+            }
         }
     },
     -- EuropaTrail module
diff --git a/data/scene/jupiter/jupiter/jup260.bsp.torrent b/data/scene/jupiter/jupiter/jup260.bsp.torrent
new file mode 100644
index 0000000000..0c82073d38
Binary files /dev/null and b/data/scene/jupiter/jupiter/jup260.bsp.torrent differ
diff --git a/data/scene/jupiter/jupiter/jupiter.data b/data/scene/jupiter/jupiter/jupiter.data
index 34dcaf0900..b22e81119b 100644
--- a/data/scene/jupiter/jupiter/jupiter.data
+++ b/data/scene/jupiter/jupiter/jupiter.data
@@ -2,4 +2,7 @@ return {
     FileRequest = {
         { Identifier = "jupiter_textures", Destination = "textures", Version = 1 }
     },
+    TorrentFiles = {
+        { File = "jup260.bsp.torrent", Destination = "${SPICE}" },
+    }
 }
\ No newline at end of file
diff --git a/data/scene/saturn/dione/dione.data b/data/scene/saturn/dione/dione.data
new file mode 100644
index 0000000000..924a314275
--- /dev/null
+++ b/data/scene/saturn/dione/dione.data
@@ -0,0 +1,5 @@
+return {
+    FileRequest = {
+        { Identifier = "dione_textures", Destination = "textures", Version = 1 }
+    },
+}
\ No newline at end of file
diff --git a/data/scene/saturn/dione/dione.mod b/data/scene/saturn/dione/dione.mod
new file mode 100644
index 0000000000..2cb996d841
--- /dev/null
+++ b/data/scene/saturn/dione/dione.mod
@@ -0,0 +1,46 @@
+return {
+    {
+        Name = "Dione",
+        Parent = "SaturnBarycenter",
+        Renderable = {
+            Type = "RenderablePlanet",
+            Frame = "IAU_DIONE",
+            Body = "DIONE",
+            Geometry = {
+                Type = "SimpleSphere",
+                Radius = { 0.563, 3 },
+                Segments = 50
+            },
+            Textures = {
+                Color = "textures/dione.jpg"
+            }
+        },
+        Transform = {
+            Translation = {
+                Type = "SpiceTranslation",
+                Body = "DIONE",
+                Observer = "SATURN BARYCENTER",
+                Kernels = "${OPENSPACE_DATA}/spice/sat375.bsp"
+            },
+            Rotation = {
+                Type = "SpiceRotation",
+                SourceFrame = "IAU_ENCELADUS",
+                DestinationFrame = "IAU_JUPITER"
+            }
+        }
+    },
+    {
+        Name = "DioneTrail",
+        Parent = "SaturnBarycenter",
+        Renderable = {
+            Type = "RenderableTrail",
+            Body = "DIONE",
+            Frame = "GALACTIC",
+            Observer = "SATURN BARYCENTER",
+            RGB = { 0.5, 0.3, 0.3 },
+            TropicalOrbitPeriod = 60,
+            EarthOrbitRatio = 0.0075,
+            DayLength = 0.9424218
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/scene/saturn/enceladus/enceladus.data b/data/scene/saturn/enceladus/enceladus.data
new file mode 100644
index 0000000000..a31589f158
--- /dev/null
+++ b/data/scene/saturn/enceladus/enceladus.data
@@ -0,0 +1,5 @@
+return {
+    FileRequest = {
+        { Identifier = "enceladus_textures", Destination = "textures", Version = 1 }
+    },
+}
\ No newline at end of file
diff --git a/data/scene/saturn/enceladus/enceladus.mod b/data/scene/saturn/enceladus/enceladus.mod
new file mode 100644
index 0000000000..73684460ae
--- /dev/null
+++ b/data/scene/saturn/enceladus/enceladus.mod
@@ -0,0 +1,46 @@
+return {
+    {
+        Name = "Enceladus",
+        Parent = "SaturnBarycenter",
+        Renderable = {
+            Type = "RenderablePlanet",
+            Frame = "IAU_ENCELADUS",
+            Body = "ENCELADUS",
+            Geometry = {
+                Type = "SimpleSphere",
+                Radius = { 0.257, 3 },
+                Segments = 50
+            },
+            Textures = {
+                Color = "textures/enceladus.jpg"
+            }
+        },
+        Transform = {
+            Translation = {
+                Type = "SpiceTranslation",
+                Body = "ENCELADUS",
+                Observer = "SATURN BARYCENTER",
+                Kernels = "${OPENSPACE_DATA}/spice/sat375.bsp"
+            },
+            Rotation = {
+                Type = "SpiceRotation",
+                SourceFrame = "IAU_ENCELADUS",
+                DestinationFrame = "IAU_JUPITER"
+            }
+        }
+    },
+    {
+        Name = "EnceladusTrail",
+        Parent = "SaturnBarycenter",
+        Renderable = {
+            Type = "RenderableTrail",
+            Body = "ENCELADUS",
+            Frame = "GALACTIC",
+            Observer = "SATURN BARYCENTER",
+            RGB = { 0.5, 0.3, 0.3 },
+            TropicalOrbitPeriod = 60,
+            EarthOrbitRatio = 0.005,
+            DayLength = 0.9424218
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/scene/saturn/iapetus/iapetus.data b/data/scene/saturn/iapetus/iapetus.data
new file mode 100644
index 0000000000..0db25d34c1
--- /dev/null
+++ b/data/scene/saturn/iapetus/iapetus.data
@@ -0,0 +1,5 @@
+return {
+    FileRequest = {
+        { Identifier = "iapetus_textures", Destination = "textures", Version = 1 }
+    },
+}
\ No newline at end of file
diff --git a/data/scene/saturn/iapetus/iapetus.mod b/data/scene/saturn/iapetus/iapetus.mod
new file mode 100644
index 0000000000..2f27987540
--- /dev/null
+++ b/data/scene/saturn/iapetus/iapetus.mod
@@ -0,0 +1,46 @@
+return {
+    {
+        Name = "Iapetus",
+        Parent = "SaturnBarycenter",
+        Renderable = {
+            Type = "RenderablePlanet",
+            Frame = "IAU_IAPETUS",
+            Body = "IAPETUS",
+            Geometry = {
+                Type = "SimpleSphere",
+                Radius = { 0.746, 3 },
+                Segments = 50
+            },
+            Textures = {
+                Color = "textures/iapetus.jpg"
+            }
+        },
+        Transform = {
+            Translation = {
+                Type = "SpiceTranslation",
+                Body = "IAPETUS",
+                Observer = "SATURN BARYCENTER",
+                Kernels = "${OPENSPACE_DATA}/spice/sat375.bsp"
+            },
+            Rotation = {
+                Type = "SpiceRotation",
+                SourceFrame = "IAU_ENCELADUS",
+                DestinationFrame = "IAU_JUPITER"
+            }
+        }
+    },
+    {
+        Name = "IapetusTrail",
+        Parent = "SaturnBarycenter",
+        Renderable = {
+            Type = "RenderableTrail",
+            Body = "IAPETUS",
+            Frame = "GALACTIC",
+            Observer = "SATURN BARYCENTER",
+            RGB = { 0.5, 0.3, 0.3 },
+            TropicalOrbitPeriod = 60,
+            EarthOrbitRatio = 0.1,
+            DayLength = 0.9424218
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/scene/saturn/mimas/mimas.data b/data/scene/saturn/mimas/mimas.data
new file mode 100644
index 0000000000..01d792a8d4
--- /dev/null
+++ b/data/scene/saturn/mimas/mimas.data
@@ -0,0 +1,5 @@
+return {
+    FileRequest = {
+        { Identifier = "mimas_textures", Destination = "textures", Version = 1 }
+    },
+}
\ No newline at end of file
diff --git a/data/scene/saturn/mimas/mimas.mod b/data/scene/saturn/mimas/mimas.mod
new file mode 100644
index 0000000000..b73ae2843a
--- /dev/null
+++ b/data/scene/saturn/mimas/mimas.mod
@@ -0,0 +1,46 @@
+return {
+    {
+        Name = "Mimas",
+        Parent = "SaturnBarycenter",
+        Renderable = {
+            Type = "RenderablePlanet",
+            Frame = "IAU_MIMAS",
+            Body = "MIMAS",
+            Geometry = {
+                Type = "SimpleSphere",
+                Radius = { 0.28, 3 },
+                Segments = 50
+            },
+            Textures = {
+                Color = "textures/mimas.jpg"
+            }
+        },
+        Transform = {
+            Translation = {
+                Type = "SpiceTranslation",
+                Body = "MIMAS",
+                Observer = "SATURN BARYCENTER",
+                Kernels = "${OPENSPACE_DATA}/spice/sat375.bsp"
+            },
+            Rotation = {
+                Type = "SpiceRotation",
+                SourceFrame = "IAU_MIMAS",
+                DestinationFrame = "IAU_JUPITER"
+            }
+        }
+    },
+    {
+        Name = "MimasTrail",
+        Parent = "SaturnBarycenter",
+        Renderable = {
+            Type = "RenderableTrail",
+            Body = "MIMAS",
+            Frame = "GALACTIC",
+            Observer = "SATURN BARYCENTER",
+            RGB = { 0.5, 0.3, 0.3 },
+            TropicalOrbitPeriod = 60,
+            EarthOrbitRatio = 0.0025,
+            DayLength = 0.9424218
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/scene/saturn/rhea/rhea.data b/data/scene/saturn/rhea/rhea.data
new file mode 100644
index 0000000000..9cf25ca314
--- /dev/null
+++ b/data/scene/saturn/rhea/rhea.data
@@ -0,0 +1,5 @@
+return {
+    FileRequest = {
+        { Identifier = "rhea_textures", Destination = "textures", Version = 1 }
+    },
+}
\ No newline at end of file
diff --git a/data/scene/saturn/rhea/rhea.mod b/data/scene/saturn/rhea/rhea.mod
new file mode 100644
index 0000000000..f5929f6b15
--- /dev/null
+++ b/data/scene/saturn/rhea/rhea.mod
@@ -0,0 +1,46 @@
+return {
+    {
+        Name = "Rhea",
+        Parent = "SaturnBarycenter",
+        Renderable = {
+            Type = "RenderablePlanet",
+            Frame = "IAU_RHEA",
+            Body = "RHEA",
+            Geometry = {
+                Type = "SimpleSphere",
+                Radius = { 0.765, 3 },
+                Segments = 50
+            },
+            Textures = {
+                Color = "textures/rhea.jpg"
+            }
+        },
+        Transform = {
+            Translation = {
+                Type = "SpiceTranslation",
+                Body = "RHEA",
+                Observer = "SATURN BARYCENTER",
+                Kernels = "${OPENSPACE_DATA}/spice/sat375.bsp"
+            },
+            Rotation = {
+                Type = "SpiceRotation",
+                SourceFrame = "IAU_ENCELADUS",
+                DestinationFrame = "IAU_JUPITER"
+            }
+        }
+    },
+    {
+        Name = "RheaTrail",
+        Parent = "SaturnBarycenter",
+        Renderable = {
+            Type = "RenderableTrail",
+            Body = "RHEA",
+            Frame = "GALACTIC",
+            Observer = "SATURN BARYCENTER",
+            RGB = { 0.5, 0.3, 0.3 },
+            TropicalOrbitPeriod = 60,
+            EarthOrbitRatio = 0.01,
+            DayLength = 0.9424218
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/scene/saturn/saturn/sat375.bsp.torrent b/data/scene/saturn/saturn/sat375.bsp.torrent
new file mode 100644
index 0000000000..1939e82e2d
Binary files /dev/null and b/data/scene/saturn/saturn/sat375.bsp.torrent differ
diff --git a/data/scene/saturn/saturn.data b/data/scene/saturn/saturn/saturn.data
similarity index 55%
rename from data/scene/saturn/saturn.data
rename to data/scene/saturn/saturn/saturn.data
index 49ba7a71da..cf0748dfc1 100644
--- a/data/scene/saturn/saturn.data
+++ b/data/scene/saturn/saturn/saturn.data
@@ -2,4 +2,7 @@ return {
     FileRequest = {
         { Identifier = "saturn_textures", Destination = "textures", Version = 2 }
     },
+    TorrentFiles = {
+        { File = "sat375.bsp.torrent", Destination = "${SPICE}" },
+    }
 }
\ No newline at end of file
diff --git a/data/scene/saturn/saturn.mod b/data/scene/saturn/saturn/saturn.mod
similarity index 96%
rename from data/scene/saturn/saturn.mod
rename to data/scene/saturn/saturn/saturn.mod
index 9bfd690438..16443c6283 100644
--- a/data/scene/saturn/saturn.mod
+++ b/data/scene/saturn/saturn/saturn.mod
@@ -3,6 +3,14 @@ return {
     {
         Name = "SaturnBarycenter",
         Parent = "SolarSystemBarycenter",
+        Transform = {
+            Translation = {
+                Type = "SpiceTranslation",
+                Body = "SATURN BARYCENTER",
+                Observer = "SUN",
+                Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
+            }
+        },
     },
 
     -- Saturn module
@@ -29,12 +37,6 @@ return {
             }
         },
         Transform = {
-            Translation = {
-                Type = "SpiceTranslation",
-                Body = "SATURN BARYCENTER",
-                Observer = "SUN",
-                Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
-            },
             Rotation = {
                 Type = "SpiceRotation",
                 SourceFrame = "IAU_SATURN",
@@ -60,7 +62,7 @@ return {
     -- SaturnTrail module
     {   
         Name = "SaturnTrail",
-        Parent = "SaturnBarycenter",
+        Parent = "SolarSystemBarycenter",
         Renderable = {
             Type = "RenderableTrail",
             Body = "SATURN BARYCENTER",
diff --git a/data/scene/saturn/tethys/tethys.data b/data/scene/saturn/tethys/tethys.data
new file mode 100644
index 0000000000..fd493213a4
--- /dev/null
+++ b/data/scene/saturn/tethys/tethys.data
@@ -0,0 +1,5 @@
+return {
+    FileRequest = {
+        { Identifier = "tethys_textures", Destination = "textures", Version = 1 }
+    },
+}
\ No newline at end of file
diff --git a/data/scene/saturn/tethys/tethys.mod b/data/scene/saturn/tethys/tethys.mod
new file mode 100644
index 0000000000..5d7ecf85e4
--- /dev/null
+++ b/data/scene/saturn/tethys/tethys.mod
@@ -0,0 +1,46 @@
+return {
+    {
+        Name = "Tethys",
+        Parent = "SaturnBarycenter",
+        Renderable = {
+            Type = "RenderablePlanet",
+            Frame = "IAU_TETHYS",
+            Body = "TETHYS",
+            Geometry = {
+                Type = "SimpleSphere",
+                Radius = { 0.538, 3 },
+                Segments = 50
+            },
+            Textures = {
+                Color = "textures/tethys.jpg"
+            }
+        },
+        Transform = {
+            Translation = {
+                Type = "SpiceTranslation",
+                Body = "TETHYS",
+                Observer = "SATURN BARYCENTER",
+                Kernels = "${OPENSPACE_DATA}/spice/sat375.bsp"
+            },
+            Rotation = {
+                Type = "SpiceRotation",
+                SourceFrame = "IAU_ENCELADUS",
+                DestinationFrame = "IAU_JUPITER"
+            }
+        }
+    },
+    {
+        Name = "TethysTrail",
+        Parent = "SaturnBarycenter",
+        Renderable = {
+            Type = "RenderableTrail",
+            Body = "TETHYS",
+            Frame = "GALACTIC",
+            Observer = "SATURN BARYCENTER",
+            RGB = { 0.5, 0.3, 0.3 },
+            TropicalOrbitPeriod = 60,
+            EarthOrbitRatio = 0.005,
+            DayLength = 0.9424218
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/scene/saturn/titan/titan.data b/data/scene/saturn/titan/titan.data
new file mode 100644
index 0000000000..82c5a342b4
--- /dev/null
+++ b/data/scene/saturn/titan/titan.data
@@ -0,0 +1,5 @@
+return {
+    FileRequest = {
+        { Identifier = "titan_textures", Destination = "textures", Version = 1 }
+    },
+}
\ No newline at end of file
diff --git a/data/scene/saturn/titan/titan.mod b/data/scene/saturn/titan/titan.mod
new file mode 100644
index 0000000000..b2843bc0a8
--- /dev/null
+++ b/data/scene/saturn/titan/titan.mod
@@ -0,0 +1,46 @@
+return {
+    {
+        Name = "Titan",
+        Parent = "SaturnBarycenter",
+        Renderable = {
+            Type = "RenderablePlanet",
+            Frame = "IAU_TITAN",
+            Body = "TITAN",
+            Geometry = {
+                Type = "SimpleSphere",
+                Radius = { 0.2575, 4 },
+                Segments = 50
+            },
+            Textures = {
+                Color = "textures/titan.jpg"
+            }
+        },
+        Transform = {
+            Translation = {
+                Type = "SpiceTranslation",
+                Body = "TITAN",
+                Observer = "SATURN BARYCENTER",
+                Kernels = "${OPENSPACE_DATA}/spice/sat375.bsp"
+            },
+            Rotation = {
+                Type = "SpiceRotation",
+                SourceFrame = "IAU_ENCELADUS",
+                DestinationFrame = "IAU_JUPITER"
+            }
+        }
+    },
+    {
+        Name = "TitanTrail",
+        Parent = "SaturnBarycenter",
+        Renderable = {
+            Type = "RenderableTrail",
+            Body = "TITAN",
+            Frame = "GALACTIC",
+            Observer = "SATURN BARYCENTER",
+            RGB = { 0.5, 0.3, 0.3 },
+            TropicalOrbitPeriod = 60,
+            EarthOrbitRatio = 0.05,
+            DayLength = 0.9424218
+        }
+    }
+}
\ No newline at end of file