MOAR work on RoomService Demo