Made this more room-like. Completely re-made.