implemented rooms

yeah sorry about the mess of commits... still getting the hang of git and had to revert some stuff... its all goods now though