Closes #37, starts on room