Revert "Revert "Room Changes + DropZone""

This reverts commit 8af4a0d18e83a215530875514d8ad43844560453.