#6613: Moving Logic into the controller