diff --git a/README.md b/README.md
index d27965b5..ed044c55 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,7 @@ Want to build your own ships? Try the [Welder Modular Ship Framework](https://eg
|---|---|---|---|---|
| | [Lugger](lugger)
![Free Blueprint][bp-free] | The Lugger is a 832 crate hauler with two 10 ring plasma thrusters serving as its main engines to provide decent speed. | v1.1.1 | 832 |
| | [Clunker](clunker)
![Free Blueprint][bp-free] | The Clunker is a 948 crate hauler with two 13 ring plasma thrusters serving as its main engines to provide decent speed. The ship is no frills and with double the upwards thrust, it is mainly designed to haul ore between a capital ship and the moon surface. | v1.0.2 | 948 |
+| | [Hoarder](hoarder)
![Free Blueprint][bp-free] | The Hoarder is a 1436 crate hauler and is a no frills ship, designed specifically to haul ore between nearby capital ships and/or stations with its short range and low speed. | v1.0.0 | 1436 |
## Salvagers
diff --git a/hoarder/README.md b/hoarder/README.md
new file mode 100644
index 00000000..1f899e36
--- /dev/null
+++ b/hoarder/README.md
@@ -0,0 +1,149 @@
+# Hoarder by EGOTech
+
+[![CC BY-NC-SA 4.0](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-lightgrey.svg)](http://creativecommons.org/licenses/by-nc-sa/4.0/)
+[![Version](https://img.shields.io/static/v1?label=Version&message=1.0.0&color=blue)](#changelog)
+[![Blueprint](https://img.shields.io/static/v1?label=Blueprint&message=Free%20Download&color=brightgreen)](#download-blueprint)
+
+The Hoarder is a 1436 crate hauler and is a no frills ship, designed specifically to haul ore between nearby capital ships and/or stations with its short range and low speed.
+The blueprint is provided for [free](#download-blueprint). All [feedback](#providing-feedback) is welcome and in game tips (in-game name Egomaniac) are appreciated. However support will be limited but I will try my best.
+
+[Starbase Ship Shop Page](https://sb-creators.org/makers/Egomaniac/ship/%5BFREE%5D%20Hoarder)
+
+
+
+
+
+More photos in the [`photos` folder](photos)
+
+## Features
+
+The ship has the following features:
+
+- 1436 crates
+- Standard Cruise function
+- Turtle and Sloth functions with adjustable rates
+- Transponder system with ping function
+- Auto generator rate script with adjustable minimum rate
+- 12 T2 generators enhanced with two T1 enhancers each with 12 T2 fuel chambers
+- Radiators that provide more than adequate cooling
+- Two large propellant tanks with 24,000,000 units of propellant
+- 60 batteries
+- Eight T2 box and 112 T2 triangle thrusters providing forward thrust
+- 44 T2 triangle thrusters providing braking thrust
+- 80 T2 triangle thrusters for maneuvers
+- Speedometer
+- Timer panel
+- Odometer panel
+- Many extra slots for YOLOL or memory chips
+- Top speed of 75m/s empty
+
+## Changelog
+
+### v1.0.0 (Current) - 03/11/2023
+
+- Initial release
+
+## Build Cost
+
+![Ship Build Cost](images/build_cost.png)
+
+> TIP: You can craft your own crates, generators (T2), box and triangle thruster components (T2) and plasma thrusters to reduce assembly cost.
+
+## Download Blueprint
+
+The blueprint file is available in the `blueprints` folder [here](https://github.com/EGO-Tech/starbase-ships/raw/main/hoarder/blueprints/hoarder.fbe).
+
+## Known Issues
+
+- The ship can run out of power when running at full thrust. Turn on `Min Gen` at 50 to avoid this when running at full thrust.
+- The ship is pretty much at its voxel limit so any additions or changes may be difficult without sacrificing crates.
+
+## Usage
+
+To enter the ship, there is a button on right side of the front of the ship that will open the `Door`.
+
+### Flying the Ship
+
+![Pilot Center Console](images/pilot_center_console.jpg)
+
+The left lever on the center console controls backwards thrust (braking) and the right lever controls forward thrust.
+
+| Interface | Function |
+|---|---|
+| `Speed` | Current speed in metres per second. |
+| `ForwardThrust` | Current forward thrust, maximum of 10,000 units |
+| `Cruise` | Activates cruise control, forward thrust will not reset to zero unless turned down. |
+| `Turtle` | Activates turtle mode which sets forward thrust to a maximum limit of `TurtleRate` of full thrust. |
+| `Sloth` | Activates the low sensitvity mode of pitch and yaw by limiting thrust. Use the `Sensitivity` switch to set the maximum thrust rate of sloth mode.|
+| `Aim` | Reduces the response time of key presses for pitch and yaw. |
+| `Guides` & `Distance` | Activates forward rangefinders, with `Distance` showing distance to object detected by center rangefinder. |
+repsective corner shows distance to the ground. |
+| `SafeZone` | Whether current location is in the safe zone. |
+| `StrengthFactor` | Current strength of ship. May fluctuate as ore crates are filled. Anything below 1.0 means ship is damaged. |
+| `Timer` | See [Timer](#timer). |
+| `Odometer` | See [Odometer](#odometer). |
+| Transponder `Toggle` & `Ping` | Transponder controls, `Toggle` turns on and off ship transponder while `Ping` will activate transponder for three seconds |
+
+**NOTE:** For safety, firing full braking thrust will deactivate `Cruise`.
+
+### Managing Power and Fuel
+
+![Pilot Right Console](images/pilot_right_console.jpg)
+
+| Interface | Function |
+|---|---|
+| `Propellant` | Total propellant remaining in propellant tanks, maximum of 72,000,000 units. |
+| `PropTime` | Time and distance remaining of propellant based on current usage. |
+| `FuelTime` | Time and distance remaining of fuel based on current usage. |
+| `Fuel Rod 1` to `Fuel Rod 12` | Fuel remaining on fuel rods in individual fuel chambers, maximum of 300,000 units for each. |
+| `Generator` | Current generator rate, maximum of `Generator Limit`. |
+| `Min Gen` & `Min Generator Limit` | Toggle and sets minimum generator rate. See [Managing Power](#managing-power). |
+| `Shutdown` | Will turn off all fuel chambers thus shutting down generators. |
+| `Battery` | Shows current battery charge of the batteries, maximum of 10,000 units. |
+| `HeatTransferRate` | Current heat transfer rate of the heat sinks, maximum of 100%. |
+| `Flow In` & `Flow Out` | Toggle flow modes of resource bridges. See [Refueling Propellant](#refueling-propellant). |
+| `Lights` | Turns on and off internal lights. |
+| `Door` | Opens or closes ship entry door. |
+| `Canopy` | Opens or closes ship entry door. |
+
+#### Managing Power
+
+By default the generator will only run and ramp up when the batteries need charging so there is minimum management needed. But you can set a minimum generate rate by setting the `Min Generator Limit` value using the switch for the minimum rate and turning on `Min Gen`.
+
+#### Refueling Propellant
+
+All five resource bridges can be used for refuelling propellant. To refuel from another ship, turn off `Flow Out` on the pilot right side console and leave `Flow In` turned on. Then connect a resource bridge to the other ship. To refuel another ship, do the opposite, `Flow Out` turned on and `Flow In` turned off.
+
+Remember to turn `Flow In` and `Flow Out` back on if you are using the Endo to collect ore via any of the ship's resource bridges.
+
+The propellant tanks are also easily accessible for swapping or crafting refills.
+
+### Other Stuff
+
+#### Timer
+
+On the pilot center console there is a `Timer` panel which acts as a timer. It will run when the ship is active and show total time in years, weeks, days, hours, minutes and seconds. To reset the timer, hold down the `Timer` of `Hold to reset`` button on the pilot left console.
+
+#### Odometer
+
+On the pilot center console there is a `Odometer` panel which will keep track of the ship's estimated flight distance based on speed. To reset the trip odometer, hold down the `Trip` of `Hold to reset` button on the pilot left console.
+
+## Providing Feedback
+
+[![EGOTech Discord](https://discordapp.com/api/guilds/1013328685564178472/widget.png?style=banner2)](https://discord.gg/BKwVGvncmN)
+
+I can be found in-game as Egomaniac and on discord as @vinteo81 (vinteo#4211). Feel free to contact me and provide feedback or if you need help. Pull requests are also welcomed for scripts changes/fixes.
+
+I would also love to see any modifications or improvements you have made, so feel free to share! I hope to learn from the community and may also incorporate your changes into future versions.
+
+Of course in-game tips are greatly appreciated.
+
+## Frequently Asked Questions
+
+### Can I sell ships based on this blueprint?
+
+No.
+
+## Designed by EGOTech
+
+![EGOTech](../others/egotech/logos/egotech_logo_light.png)
diff --git a/hoarder/blueprints/hoarder.fbe b/hoarder/blueprints/hoarder.fbe
new file mode 100644
index 00000000..130ecd2c
Binary files /dev/null and b/hoarder/blueprints/hoarder.fbe differ
diff --git a/hoarder/images/build_cost.png b/hoarder/images/build_cost.png
new file mode 100644
index 00000000..fd7b1d69
Binary files /dev/null and b/hoarder/images/build_cost.png differ
diff --git a/hoarder/images/pilot_center_console.jpg b/hoarder/images/pilot_center_console.jpg
new file mode 100644
index 00000000..3b8349e8
Binary files /dev/null and b/hoarder/images/pilot_center_console.jpg differ
diff --git a/hoarder/images/pilot_right_console.jpg b/hoarder/images/pilot_right_console.jpg
new file mode 100644
index 00000000..fe1e1895
Binary files /dev/null and b/hoarder/images/pilot_right_console.jpg differ
diff --git a/hoarder/photos/20231103134753_1.jpg b/hoarder/photos/20231103134753_1.jpg
new file mode 100644
index 00000000..535e5eb4
Binary files /dev/null and b/hoarder/photos/20231103134753_1.jpg differ
diff --git a/hoarder/photos/20231103134817_1.jpg b/hoarder/photos/20231103134817_1.jpg
new file mode 100644
index 00000000..9ecb4118
Binary files /dev/null and b/hoarder/photos/20231103134817_1.jpg differ
diff --git a/hoarder/photos/20231103134818_1.jpg b/hoarder/photos/20231103134818_1.jpg
new file mode 100644
index 00000000..527f0b1f
Binary files /dev/null and b/hoarder/photos/20231103134818_1.jpg differ
diff --git a/hoarder/photos/20231103134837_1.jpg b/hoarder/photos/20231103134837_1.jpg
new file mode 100644
index 00000000..7c521a07
Binary files /dev/null and b/hoarder/photos/20231103134837_1.jpg differ
diff --git a/hoarder/photos/20231103134925_1.jpg b/hoarder/photos/20231103134925_1.jpg
new file mode 100644
index 00000000..2c9c9d4d
Binary files /dev/null and b/hoarder/photos/20231103134925_1.jpg differ
diff --git a/hoarder/photos/20231103134942_1.jpg b/hoarder/photos/20231103134942_1.jpg
new file mode 100644
index 00000000..5b120fbc
Binary files /dev/null and b/hoarder/photos/20231103134942_1.jpg differ
diff --git a/hoarder/photos/20231103135048_1.jpg b/hoarder/photos/20231103135048_1.jpg
new file mode 100644
index 00000000..cad7cb67
Binary files /dev/null and b/hoarder/photos/20231103135048_1.jpg differ
diff --git a/hoarder/photos/20231103135106_1.jpg b/hoarder/photos/20231103135106_1.jpg
new file mode 100644
index 00000000..6538fd1e
Binary files /dev/null and b/hoarder/photos/20231103135106_1.jpg differ
diff --git a/hoarder/photos/20231103135119_1.jpg b/hoarder/photos/20231103135119_1.jpg
new file mode 100644
index 00000000..033c87b8
Binary files /dev/null and b/hoarder/photos/20231103135119_1.jpg differ
diff --git a/hoarder/photos/20231103154937_1.jpg b/hoarder/photos/20231103154937_1.jpg
new file mode 100644
index 00000000..7d212622
Binary files /dev/null and b/hoarder/photos/20231103154937_1.jpg differ
diff --git a/hoarder/photos/20231103154943_1.jpg b/hoarder/photos/20231103154943_1.jpg
new file mode 100644
index 00000000..bc01dc25
Binary files /dev/null and b/hoarder/photos/20231103154943_1.jpg differ
diff --git a/hoarder/yolol/cruise_safety_basic.yolol b/hoarder/yolol/cruise_safety_basic.yolol
new file mode 100644
index 00000000..7937e6f6
--- /dev/null
+++ b/hoarder/yolol/cruise_safety_basic.yolol
@@ -0,0 +1 @@
+if:fcubackward==100then:cruise=10end goto1
diff --git a/hoarder/yolol/dynamic_generator_basic.yolol b/hoarder/yolol/dynamic_generator_basic.yolol
new file mode 100644
index 00000000..ebed32a8
--- /dev/null
+++ b/hoarder/yolol/dynamic_generator_basic.yolol
@@ -0,0 +1 @@
+:GenRate=:MinEPS*:Min_EPS+(10000-:Battery)/80 goto1
diff --git a/hoarder/yolol/fuel_time_advanced.yolol b/hoarder/yolol/fuel_time_advanced.yolol
new file mode 100644
index 00000000..89c728b4
--- /dev/null
+++ b/hoarder/yolol/fuel_time_advanced.yolol
@@ -0,0 +1,4 @@
+n="\n" a="h" b="m" c="s" k="km" e="\n\nDistance:\n"
+s=t%60 m=(t-s)%3600/60 h=(t-m*60-s)/3600 d=:sp*t/1000
+:FuelTime=n+h+a+m+b+(s-s%1)+c+e+d+k f=:Fuel :fcw=19
+t=:Fuel/((f-:Fuel)/4) goto2
diff --git a/hoarder/yolol/min_eps_switch_basic.yolol b/hoarder/yolol/min_eps_switch_basic.yolol
new file mode 100644
index 00000000..8a61b2b1
--- /dev/null
+++ b/hoarder/yolol/min_eps_switch_basic.yolol
@@ -0,0 +1 @@
+:MinEPS=(:MinEPS+:mes)*(:MinEPS>=0)-:MinEPS>100 goto1
diff --git a/hoarder/yolol/odometer_basic.yolol b/hoarder/yolol/odometer_basic.yolol
new file mode 100644
index 00000000..74f7224e
--- /dev/null
+++ b/hoarder/yolol/odometer_basic.yolol
@@ -0,0 +1,5 @@
+n="\n" k=1000 u="km" t="Trip:"+n
+if:odo_res>0then:odometer=n+"Reseting..." :odo_t=0end
+s=:sp :odo_l+=s/k :odo_t+=s/k
+if:Odometer==""thengoto1end :Odometer=n+:odo_l+u+n+n+t+:odo_t+u+n
+goto1
diff --git a/hoarder/yolol/prop_time_advanced.yolol b/hoarder/yolol/prop_time_advanced.yolol
new file mode 100644
index 00000000..cde7fca4
--- /dev/null
+++ b/hoarder/yolol/prop_time_advanced.yolol
@@ -0,0 +1,4 @@
+n="\n" a="h" b="m" c="s" k="km" e="\n\nDistance:\n" t=0
+s=t%60 m=(t-s)%3600/60 h=(t-m*60-s)/3600 d=:sp*t/1000
+:PropTime=n+h+a+m+b+(s-s%1)+c+e+d+k p=:Propellant :pcw=19
+t=:Propellant/((p-:Propellant)/4) goto2
diff --git a/hoarder/yolol/sensitivity_switch_basic.yolol b/hoarder/yolol/sensitivity_switch_basic.yolol
new file mode 100644
index 00000000..4b2a6683
--- /dev/null
+++ b/hoarder/yolol/sensitivity_switch_basic.yolol
@@ -0,0 +1 @@
+:sense=(:sense+:sss)*(:sense>=0)-:sense>100 goto1
diff --git a/hoarder/yolol/sloth_basic.yolol b/hoarder/yolol/sloth_basic.yolol
new file mode 100644
index 00000000..45679a52
--- /dev/null
+++ b/hoarder/yolol/sloth_basic.yolol
@@ -0,0 +1,2 @@
+if:sloth<1then:sense1=100 :sense2=-100 goto1end
+:sense1=:sensitivity :sense2=-:sensitivity goto1
diff --git a/hoarder/yolol/timer_advanced.yolol b/hoarder/yolol/timer_advanced.yolol
new file mode 100644
index 00000000..7eae08a2
--- /dev/null
+++ b/hoarder/yolol/timer_advanced.yolol
@@ -0,0 +1,12 @@
+n="\n" q="y" j="w" k="d" l="h" o="m"
+u="s" g="Reseting..." a=60 b=a*a c=b*24 e=c*7 f=c*365 x=1000
+if:t_res>0then:ts=0 z=n+n+g end :Timer=z
+t=:ts s=t%a t-=s m=t%b/a t-=m*a h=t%c/b t-=h*b d=t%e/c t-=d*c w=t%f/e
+t-=w*e y=t/f z=n ify>0thenz+=y+q end r=w%1 d+=r*7 ifd>6thenw++ d-=7end
+ifw>0thenz+=w/x*x+j end v=d%1 ifv==0.999thend+=0.001end // rounding
+ifd>0thenz+=d+k+n elsez+=n end z+=h+l+m+o+s+u+n+n :ts++ goto3
+
+// Outputs:
+// :Timer - Global for text panel
+// Inputs:
+// :ts - store timer in seconds, put in memory chip or device
diff --git a/hoarder/yolol/total_fuel_basic.yolol b/hoarder/yolol/total_fuel_basic.yolol
new file mode 100644
index 00000000..0aead7d7
--- /dev/null
+++ b/hoarder/yolol/total_fuel_basic.yolol
@@ -0,0 +1 @@
+:fuel=:f1+:f2+:f3+:f4+:f5+:f6+:f7+:f8+:f9+:f10+:f11+:f12 goto1
\ No newline at end of file
diff --git a/hoarder/yolol/transponder_ping_basic.yolol b/hoarder/yolol/transponder_ping_basic.yolol
new file mode 100644
index 00000000..c2773d79
--- /dev/null
+++ b/hoarder/yolol/transponder_ping_basic.yolol
@@ -0,0 +1,2 @@
+s=3 if:Ping<1thengoto1end i=0 :ponder=1 :idBlink=1
+ifi=0)-:TurtleRate>100 goto1