updates to the the organization controller and space model.