Maybe we also need to do something here with the object ownership? I don't have a clear picture of this.