Working on organization controller and model