diff --git a/typeclasses/rooms_dark.py b/typeclasses/rooms_dark.py
index 2a1d37c..e83392b 100755
--- a/typeclasses/rooms_dark.py
+++ b/typeclasses/rooms_dark.py
@@ -23,7 +23,9 @@ from evennia import (
     utils,
 )
 from evennia.commands.default.general import CmdInventory
-from evennia.commands.default.cmdset_account import CmdOOC
+from evennia.commands.default.account import CmdOOC
+from evennia.commands.default.building import CmdTypeclass
+from evennia.commands.default.system import CmdPy
 
 # from evennia.utils import dedent, delay, search
 from evennia.contrib.rpg.rpsystem import CmdEmote
@@ -32,6 +34,7 @@ from evennia.contrib.rpg.rpsystem import CmdEmote
 from commands.everyone import CmdSay, CmdWhisper
 from commands.misc import CmdLight
 from commands.wizards import CmdGM
+from typeclasses.objects import Listener
 from typeclasses.lightables import LightSource
 from typeclasses.rooms import Room
 
@@ -168,11 +171,13 @@ class DarkCmdSet(CmdSet):
         self.add(CmdLight())
         self.add(CmdInventory())
         self.add(CmdOOC())
+        self.add(CmdPy())
+        self.add(CmdTypeclass())
         self.add(default_cmds.CmdQuit())
         self.add(default_cmds.CmdHome())
 
 
-class DarkRoom(Room):
+class DarkRoom(Room, Listener):
     """A dark room. This tries to start the DarkState script on all
     objects entering. The script is responsible for making sure it is
     valid (that is, that there is no light source shining in the room).