diff --git a/resources/radar/gr75.png b/resources/radar/gr75.png
new file mode 100755
index 0000000000..9766d6aeae
Binary files /dev/null and b/resources/radar/gr75.png differ
diff --git a/scripts-piglit/shiptemplates/player_star_wars.lua b/scripts-piglit/shiptemplates/player_star_wars.lua
index b47316e7ea..e249a10691 100644
--- a/scripts-piglit/shiptemplates/player_star_wars.lua
+++ b/scripts-piglit/shiptemplates/player_star_wars.lua
@@ -6,32 +6,32 @@ function playerFighter(shields)
     -- a single pilot fighter
     local template = ShipTemplate()
     template:setType("playership")
-	template:setModel("WespeScout"..color_player)
-	template:setImpulseSoundFile("sfx/engine_fighter.wav")
+    template:setModel("WespeScout"..color_player)
+    template:setImpulseSoundFile("sfx/engine_fighter.wav")
     if shields then
-        template:setHull(37)	-- asteroid makes 35 dmg
+        template:setHull(37)    -- asteroid makes 35 dmg
         template:setShields(34, 34)
     else
-        template:setHull(2*36)	-- asteroid makes 35 dmg
+        template:setHull(2*36)    -- asteroid makes 35 dmg
     end
-	--	speed, turn, accel, rev-speed, rev-accel
-	template:setSpeed(100, 28, 40, 25, 20)
-	--template:setCombatManeuver(600, 200)
-	template:setEnergyStorage(500)
-	template:setRepairCrewCount(1)
+    --    speed, turn, accel, rev-speed, rev-accel
+    template:setSpeed(100, 28, 40, 25, 20)
+    --template:setCombatManeuver(600, 200)
+    template:setEnergyStorage(500)
+    template:setRepairCrewCount(1)
     template:setLongRangeRadarRange(10000)
-	template:setShortRangeRadarRange(5000)
-	template:setCanScan(false)
-	template:setCanHack(false)
-	template:setCanDock(true)
-	template:setCanCombatManeuver(false)
-	template:setCanLaunchProbe(false)
-	template:setCanSelfDestruct(false)
-	template:setAutoCoolant(true)
-	template:setAutoMissileReload(true)
-	template:setAutoRepair(true)
-	template:setDefaultAI('fighter')
-	addSystemsWespe(template)
+    template:setShortRangeRadarRange(5000)
+    template:setCanScan(false)
+    template:setCanHack(false)
+    template:setCanDock(true)
+    template:setCanCombatManeuver(false)
+    template:setCanLaunchProbe(false)
+    template:setCanSelfDestruct(false)
+    template:setAutoCoolant(true)
+    template:setAutoMissileReload(true)
+    template:setAutoRepair(true)
+    template:setDefaultAI('fighter')
+    addSystemsWespe(template)
     return template
 end
 
@@ -68,7 +68,7 @@ template:setSpeed(100, 20, 40, 25, 20)
 
 
 --[[Player Transport--]]
-template = ShipTemplate():setName("YT-2400"):setClass(_("class", "Frigther"), _("subclass", "Light transport")):setType("playership")
+template = ShipTemplate():setName("YT-2400"):setClass(_("class", "Freighter"), _("subclass", "Light transport")):setType("playership")
 template:setModel("LightCorvette"..color_player)
 template:setRadarTrace("yt2400b.png")
 template:setDescription([[The YT-2400 light freighter, also known as the YT-2400 transport, was a class of YT-series light freighter. During the Imperial Era, this model of freighter was used by both the Galactic Empire and the Alliance to Restore the Republic. The YT-2400 also saw use under cargo haulers and pirates.]])
@@ -119,8 +119,30 @@ template:setHull(200)
 --	            speed, turn, accel, rev-speed, rev-accel
 template:setSpeed(80, 10, 20)
 template:setCombatManeuver(400, 250)
-template:setRepairCrewCount(0)	--XXX ?
+template:setRepairCrewCount(4)
 template:setDockClasses(_("class", "Starfighter"))
+template:setRepairDocked(true)
+template:setSharesEnergyWithDocked(false)
+template:setRestocksMissilesDocked("all")
 addSystemsMulitGun(template)
 
+--[[Heavy Freighter]]
+template = ShipTemplate():setName("GR-75"):setClass(_("class", "Freighter"), _("subclass", "Medium Transport")):setModel("transport_4_2")
+template:setType("playership")
+template:setDescription([[The GR-75 medium transport, sometimes referred to as the Gallofree transport, was a transport designed and constructed by Gallofree Yards, Inc.. They were lightly armed with a clamshell-like hull to protect the cargo pods it carried. They could not reach anymore than 650 kilometers per hour.]])
+template:setRadarTrace("gr75.png")
+template:setShields(70, 70, 70, 70)
+template:setHull(200)
+--	            speed, turn, accel, rev-speed, rev-accel
+template:setSpeed(40, 5, 7)
+--                  Arc, Dir, Range, CycleTime, Dmg
+template:setBeam(0, 10,   0, 1500.0, 6.0, 6)
+template:setBeam(1, 10, 180, 1500.0, 6.0, 6)
+--                               Arc, Dir, Rotate speed
+template:setBeamWeaponTurret( 0, 120,   0, 6)
+template:setBeamWeaponTurret( 1, 120, 180, 6)
+template:setCanCombatManeuver(false)
+template:setRepairCrewCount(5)
+addSystemsTransport(template)
+
 
diff --git a/shattered_horizon_laucher.py b/shattered_horizon_laucher.py
index 7554930e7d..c8a400b035 100755
--- a/shattered_horizon_laucher.py
+++ b/shattered_horizon_laucher.py
@@ -9,12 +9,13 @@
 
 
 playerships = {
-    "Artful Dodger": ("YT-2K",      "Leanti Meva's YT-2K"),
-    "Bluewing":     ("U-Wing",      "Ric Halcard's U-Wing"),
-    "Lunaris":      ("YT-2400",     "Caex Vanta's YT-2400"),
-    "Orga-Schiff":  ("Gozanti",     "Kell Murtry's Gozanti"),
-    "None":         ("",            "does not spawn a ship")
-    }
+    "Artful Dodger":    ("YT-2K",       "Leanti Meva's YT-2K"),
+    "Bluewing":         ("U-Wing",      "Ric Halcard's U-Wing"),
+    "Cropdust Nomad":   ("Gozanti",     "Kell Murtry's Gozanti"),
+    "Greedy Wampa":     ("GR-75",       "~Caro~'s GR-75"),  #TODO find out character name
+    "Lunaris":          ("YT-2400",     "Caex Vanta's YT-2400"),
+    "None":             ("",            "does not spawn a ship")
+}
 
 factions = [
     ("Imperial",            ""),