Now fills rooms...mostly.
Rooms now fill properly. Code needs cleanup.