Still need to hookup a barrier query, and get them drawn to the screen.
I've also refactored the rooms slightly.