Started conversion to new room generation mechanism. Still needs a lot of fixes, WIP