Changed rooms to use our new 'singleton-ish' idea