Initial work on rooms