Room stuff

by @j.brown_x

j.brown_x