Controller's refactor in progres.