diff --git a/mods/ts/rules/nod-structures.yaml b/mods/ts/rules/nod-structures.yaml
index f704998d8e..39db5143d0 100644
--- a/mods/ts/rules/nod-structures.yaml
+++ b/mods/ts/rules/nod-structures.yaml
@@ -364,3 +364,45 @@ NASTLH:
 	SelectionDecorations:
 		VisualBounds: 106, 60, 8, -15
 
+NAWAST:
+	Inherits: ^Building
+	Valued:
+		Cost: 1600
+	Tooltip:
+		Name: Waste Refinery
+		Description: Processes Veins\ninto useable resources.
+	Buildable:
+		BuildPaletteOrder: 110
+		Prerequisites: namisl
+		Queue: Building
+		BuildLimit: 1
+	Building:
+		Footprint: =x= xx= =x=
+		Dimensions: 3,3
+	Selectable:
+		Bounds: 100, 60, 5, -5
+	Health:
+		HP: 400
+	RevealsShroud:
+		Range: 6c0
+	TiberianSunRefinery:
+		DockAngle: 160
+		DockOffset: 2,1
+	StoresResources:
+		PipColor: Red
+		PipCount: 15
+		Capacity: 56
+	FreeActor:
+		Actor: WEED
+		SpawnOffset: 3,1
+		Facing: 160
+	WithIdleOverlay@GLOW:
+		Sequence: idle-glow
+	WithIdleOverlay@LIGHTS:
+		Sequence: idle-lights
+	WithIdleOverlay@BIB:
+		Sequence: bib
+	ProvidesPrerequisite@buildingname:
+	SelectionDecorations:
+		VisualBounds: 100, 60, 5, -5
+	RenderSprites:
diff --git a/mods/ts/rules/nod-support.yaml b/mods/ts/rules/nod-support.yaml
index 71f2236174..ad9f4e32d2 100644
--- a/mods/ts/rules/nod-support.yaml
+++ b/mods/ts/rules/nod-support.yaml
@@ -255,6 +255,7 @@ NAMISL:
 		IndicatorPalette: mouse
 	RequiresPower:
 	DisabledOverlay:
+	ProvidesPrerequisite@buildingname:
 	SupportPowerChargeBar:
 	NukePower:
 		Cursor: nuke
diff --git a/mods/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml
index e53c8bd106..c3ea24fa90 100644
--- a/mods/ts/rules/nod-vehicles.yaml
+++ b/mods/ts/rules/nod-vehicles.yaml
@@ -164,7 +164,7 @@ REPAIR:
 		Voice: Attack
 
 WEED:
-	Inherits: ^VoxelVehicle
+	Inherits: ^VoxelTank
 	Valued:
 		Cost: 1400
 	Tooltip:
@@ -172,17 +172,33 @@ WEED:
 		Description: Collects veins for processing.\n  Unarmed
 	Buildable:
 		Queue: Vehicle
-		BuildPaletteOrder: 10
-		Prerequisites: ~naweap, natech # TODO: natech must be nawast
+		BuildPaletteOrder: 100
+		Prerequisites: ~naweap, nawast
+	Harvester:
+		DeliveryBuildings: nawast
+		Capacity: 7
+		Resources: Veins
+		UnloadTicksPerBale: 20
+		LoadTicksPerBale: 40
+		SearchFromProcRadius: 72
+		SearchFromOrderRadius: 36
+		HarvestVoice: Attack
+		DeliverVoice: Move
 	Mobile:
 		Speed: 71
 		ROT: 5
 	Health:
 		HP: 600
+	SelfHealing:
+		Ticks: 10
+		HealIfBelow: 50%
+		DamageCooldown: 200
 	Armor:
 		Type: Heavy
 	RevealsShroud:
 		Range: 4c0
+	-WithVoxelBody:
+	WithVoxelUnloadBody:
 	-GainsExperience:
 
 SAPC:
diff --git a/mods/ts/rules/shared-vehicles.yaml b/mods/ts/rules/shared-vehicles.yaml
index e6b37261f3..a57d58bd26 100644
--- a/mods/ts/rules/shared-vehicles.yaml
+++ b/mods/ts/rules/shared-vehicles.yaml
@@ -54,6 +54,7 @@ HARV:
 		Priority: 7
 		Bounds: 36,36
 	Harvester:
+		DeliveryBuildings: proc
 		Capacity: 20
 		Resources: Tiberium, BlueTiberium
 		UnloadTicksPerBale: 1
diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml
index 4f6af930dd..69e215633c 100644
--- a/mods/ts/sequences/structures.yaml
+++ b/mods/ts/sequences/structures.yaml
@@ -968,6 +968,47 @@ proc.nod:
 		Offset: 0, 0
 		UseTilesetCode: false
 
+nawast:
+	Defaults: ntwast
+		Offset: 0, -36
+		UseTilesetCode: true
+	idle:
+		ShadowStart: 3
+	damaged-idle:
+		Start: 1
+		ShadowStart: 4
+	dead:
+		Start: 2
+		ShadowStart: 5
+		Tick: 400
+	make: ntwastmk
+		Length: 19
+		ShadowStart: 19
+	idle-glow: ntwast_a
+		Length: 20
+		ShadowStart: 40
+		Tick: 120
+	damaged-idle-glow: ntwast_a
+		Start: 20
+		Length: 20
+		ShadowStart: 60
+		Tick: 120
+	idle-lights: ntwast_b
+		Length: 16
+		Tick: 120
+	damaged-idle-lights: ntwast_b
+		Start: 16
+		Length: 16
+		Tick: 120
+	bib: ntwastbb
+		ZOffset: -1024
+	damaged-bib: ntwastbb
+		Start: 1
+		ZOffset: -1024
+	icon: wasticon
+		Offset: 0, 0
+		UseTilesetCode: false
+
 gasilo.gdi:
 	Defaults: gtsilo
 		Offset: 0, -24
diff --git a/mods/ts/sequences/voxels.yaml b/mods/ts/sequences/voxels.yaml
index 8b06b25b0a..fa919c83ec 100644
--- a/mods/ts/sequences/voxels.yaml
+++ b/mods/ts/sequences/voxels.yaml
@@ -94,6 +94,7 @@ repair:
 
 weed:
 	idle:
+	unload:
 
 bus:
 	idle: