WIP - move logic from controller to decorator