Mob 1532

@nandy-andy @RafLeszczynski @rogatty Please, review ;) DO NOT MERGE JUST YET
You're right, this clearly belongs to the controller ;)