diff --git a/DATA/UNIVERSE/custom_bases/REMLINER_Base.ini b/DATA/UNIVERSE/custom_bases/REMLINER_Base.ini
index e7224bbb..a5ddbb96 100644
--- a/DATA/UNIVERSE/custom_bases/REMLINER_Base.ini
+++ b/DATA/UNIVERSE/custom_bases/REMLINER_Base.ini
@@ -6,6 +6,10 @@ start_room = Deck
 nickname = Deck
 file = Universe\custom_bases\rooms\REM_Deck.ini
 
+[Room]
+nickname = Trader
+file = Universe\custom_bases\rooms\REM_trader.ini
+
 [Room]
 nickname = Equipment
 file = Universe\custom_bases\rooms\REM_equipment.ini
diff --git a/DATA/UNIVERSE/custom_bases/rooms/REM_Deck.ini b/DATA/UNIVERSE/custom_bases/rooms/REM_Deck.ini
index 32ccffb5..7a743070 100644
--- a/DATA/UNIVERSE/custom_bases/rooms/REM_Deck.ini
+++ b/DATA/UNIVERSE/custom_bases/rooms/REM_Deck.ini
@@ -21,6 +21,11 @@ name = IDS_HOTSPOT_DECK
 behavior = ExitDoor
 room_switch = Deck
 
+[Hotspot]
+name = IDS_HOTSPOT_COMMODITYTRADER_ROOM
+behavior = ExitDoor
+room_switch = Trader
+
 [Hotspot]
 name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
 behavior = VirtualRoom
diff --git a/DATA/UNIVERSE/custom_bases/rooms/REM_equipment.ini b/DATA/UNIVERSE/custom_bases/rooms/REM_equipment.ini
index 31aa81f1..fe99b7fa 100644
--- a/DATA/UNIVERSE/custom_bases/rooms/REM_equipment.ini
+++ b/DATA/UNIVERSE/custom_bases/rooms/REM_equipment.ini
@@ -1,9 +1,10 @@
 [Room_Info]
-set_script = scripts\bases\Li_01_equipment_hardpoint_01.thn
-scene = all, ambient, Scripts\Bases\Li_01_equipment_ambi_int_01.thn
-goodscart_script = scripts\bases\Li_01_equipment_carts_01.thn
+set_script = Scripts\Bases\li_08_Deck_hardpoint_01.thn
+scene = all, ambient, Scripts\Bases\li_08_Deck_ambi_int_01.thn
+animation = Sc_loop
 
 [Spiels]
+CommodityDealer = manhattan_commodity_spiel
 EquipmentDealer = manhattan_equipment_spiel
 
 [Room_Sound]
@@ -28,10 +29,10 @@ room_switch = Deck
 ;behavior = ExitDoor
 ;room_switch = Bar
 
-;[Hotspot]
-;name = IDS_HOTSPOT_COMMODITYTRADER_ROOM
-;behavior = ExitDoor
-;room_switch = Trader
+[Hotspot]
+name = IDS_HOTSPOT_COMMODITYTRADER_ROOM
+behavior = ExitDoor
+room_switch = Trader
 
 [Hotspot]
 name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
diff --git a/DATA/UNIVERSE/custom_bases/rooms/REM_shipdealer.ini b/DATA/UNIVERSE/custom_bases/rooms/REM_shipdealer.ini
index 9bfe5261..ad3112f6 100644
--- a/DATA/UNIVERSE/custom_bases/rooms/REM_shipdealer.ini
+++ b/DATA/UNIVERSE/custom_bases/rooms/REM_shipdealer.ini
@@ -30,10 +30,10 @@ room_switch = Deck
 ;behavior = ExitDoor
 ;room_switch = Bar
 
-;[Hotspot]
-;name = IDS_HOTSPOT_COMMODITYTRADER_ROOM
-;behavior = ExitDoor
-;room_switch = Trader
+[Hotspot]
+name = IDS_HOTSPOT_COMMODITYTRADER_ROOM
+behavior = ExitDoor
+room_switch = Trader
 
 [Hotspot]
 name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
diff --git a/DATA/UNIVERSE/custom_bases/rooms/REM_trader.ini b/DATA/UNIVERSE/custom_bases/rooms/REM_trader.ini
new file mode 100644
index 00000000..981b93d1
--- /dev/null
+++ b/DATA/UNIVERSE/custom_bases/rooms/REM_trader.ini
@@ -0,0 +1,58 @@
+[Room_Info]
+set_script = Scripts\Bases\li_08_Deck_hardpoint_01.thn
+scene = all, ambient, Scripts\Bases\li_08_Deck_ambi_int_01.thn
+animation = Sc_loop
+
+[Spiels]
+CommodityDealer = manhattan_commodity_spiel
+EquipmentDealer = manhattan_equipment_spiel
+
+[Room_Sound]
+ambient = ambience_comm
+
+[Camera]
+name = Camera_0
+
+[PlayerShipPlacement]
+name = X/Shipcentre/01
+
+[CharacterPlacement]
+name = Zg/PC/Player/02/A/Stand
+
+[Hotspot]
+name = IDS_HOTSPOT_EXIT
+behavior = ExitDoor
+room_switch = Deck
+
+;[Hotspot]
+;name = IDS_HOTSPOT_BAR
+;behavior = ExitDoor
+;room_switch = Bar
+
+[Hotspot]
+name = IDS_HOTSPOT_COMMODITYTRADER_ROOM
+behavior = ExitDoor
+room_switch = Trader
+
+[Hotspot]
+name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
+behavior = ExitDoor
+room_switch = Equipment
+
+[Hotspot]
+name = IDS_HOTSPOT_SHIPDEALER_ROOM
+behavior = ExitDoor
+room_switch = ShipDealer
+
+[Hotspot]
+name = IDS_DEALER_FRONT_DESK
+behavior = FrontDesk
+state_read = 1
+state_send = 2
+
+[Hotspot]
+name = IDS_HOTSPOT_COMMODITYTRADER
+behavior = StartDealer
+state_read = 2
+state_send = 1
+