Updated Room Generation

Rewrote the room generation methods.