Refactor. Smarten rooms. Update to latest spec.