work in progress user in rooms
bugs fixed and tonnes of refactorizoring
resolved merge conflict
minor fixes