Lots of stuff to do with rooms and systems

Signed-off-by: Matt Boyd <mattuk81@gmail.com>