Corrected room creation, added TODO