Prepared the collisions to merge with the rooms.

I wasted a lot of time trying to wrap my head around everything, but I think I figured it out. In the meantime, I want to start merging this into my code for the rooms.