Another Room class push

Signed-off-by: mourthag <julispittel@gmail.com>