Adjusted rooms service to use new system
Merge pull request #19 from DeX3/qa

Adjusted rooms service to use new system