I'll get on this once I can clean up the room loading indicator :smile: