diff --git a/mods/d2k/TODO b/mods/d2k/TODO
index 2d6a30a079..e8b997cea2 100644
--- a/mods/d2k/TODO
+++ b/mods/d2k/TODO
@@ -1,5 +1,5 @@
 # make structures appear earlier when errecting from ground
-# harvester unload frames missing (too few DATA.R8 frames in general)
+# harvester harvest and unload frames missing (too few DATA.R8 frames in general)
 # carryalls should automatically transport harvesters (needs complex logic)
 # windtrap animations missing
 # outpost animations missing
@@ -22,8 +22,9 @@
 # add deathhand missile (nuke)
 # add sandworm
 # add thumper which really attracts sandworms
+# add neutral buildings: emperor palace, fremen siech, smugglers house
 # allow upgrades
-# add voices (Dune 2000/DATA/SFX folder contains .aud files)
+# allow different EVA voices for each faction (currently Atreides only)
 # add SOUND.TS .wav file extractor to RA.Utility.exe
 # convert .wav to .aud or support .wav files for Dune 2000 sounds
 # add muzzles and explosions with lightning (might need engine update)
@@ -34,7 +35,6 @@
 # add sonic tank weapon (currently uses tesla)
 # make deviator change the allegiance of ememy units (currently shoots rockets)
 # replace RA mouse.shp, nopower.shp with Dune 2000 equivalent
-# add bots (blocked by issue #2184)
 # complete Arrakis tileset (blocked by issue #2178)
 # allow frigate to deliver 5 units at once to starport
 # starport prices should vary
\ No newline at end of file
diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml
index d12f542f2e..d4e180193e 100644
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -6,25 +6,41 @@ Player:
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
 		QueuedAudio: AI_BUILD.AUD
+		OnHoldAudio: AI_HOLD.AUD
 		ReadyAudio: AI_BDRDY.AUD
+		CancelledAudio: AI_CANCL.AUD
 	ClassicProductionQueue@Defense:
 		Type: Defense
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
 		QueuedAudio: AI_BUILD.AUD
+		OnHoldAudio: AI_HOLD.AUD
 		ReadyAudio: AI_BDRDY.AUD
+		CancelledAudio: AI_CANCL.AUD
 	ClassicProductionQueue@Vehicle:
 		Type: Vehicle
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
+		ReadyAudio: AI_UNRDY.AUD
+		QueuedAudio:AI_TRAIN.AUD
+		OnHoldAudio: AI_HOLD.AUD
+		CancelledAudio: AI_CANCL.AUD
 	ClassicProductionQueue@Infantry:
 		Type: Infantry
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
+		ReadyAudio: AI_UNRDY.AUD
+		QueuedAudio:AI_TRAIN.AUD
+		OnHoldAudio: AI_HOLD.AUD
+		CancelledAudio: AI_CANCL.AUD
 	ClassicProductionQueue@Plane:
 		Type: Plane
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
+		ReadyAudio: AI_UNRDY.AUD
+		QueuedAudio:AI_TRAIN.AUD
+		OnHoldAudio: AI_HOLD.AUD
+		CancelledAudio: AI_CANCL.AUD
 	PlaceBuilding:
 	SupportPowerManager:
 	ConquestVictoryConditions:
@@ -86,6 +102,7 @@ Player:
 	DebugResourceOreCapacity:
 	-GpsWatcher:
 	BaseAttackNotifier:
+		Audio: AI_ATACK.AUD
 
 World:	
 	OpenWidgetAtGameStart:
@@ -189,15 +206,17 @@ World:
 	SpawnMPUnits@ordos:
 		InitialUnit: mcvo
 		Faction: ordos
+#TODO: These are just the Atreides sounds.
 	EvaAlerts:
 		RadarUp:
 		RadarDown:
-		BuildingCannotPlaceAudio:
+		BuildingCannotPlaceAudio: AI_PLACE.AUD
 		CashTickUp:
 		CashTickDown:
-		LowPower:
-		SilosNeeded:
-		PrimaryBuildingSelected:
+		NewOptions: AI_NEWOP.AUD
+		LowPower: AI_POWER.AUD
+		SilosNeeded: AI_SILOS.AUD
+		PrimaryBuildingSelected: AI_PRMRY.AUD
 		AbilityInsufficientPower:
 		LevelUp:
 	SpatialBins: