ES: adding in rooms and start of some structure