WIP commit of area/room persistence. Probably breaks the main.