Some rudimentary boundary checking in-room

There is a bug somewhere in the views though!