Revert "Revert "more roomservice bits""

This reverts commit 0306103eb264459ed0dc87d14b83bc7ee1f8c213.