added beginnings of room support