Heavily refactored rooms.py, now object focused.  Many bug fixes