Controller now does what it is supposed to do....