Adding remaining rooms + refactoring access modifiers wrongly set as public because of serialization issues in previous commit