Moves chunk to partial
Moves some logic to controller