Mob 1532

@nandy-andy @RafLeszczynski @rogatty Please, review ;) DO NOT MERGE JUST YET
It seems pretty clean IMO. @RafLeszczynski what do you think?