Mob 1532

@nandy-andy @RafLeszczynski @rogatty Please, review ;) DO NOT MERGE JUST YET
LGTM - would like to abstract modal creation logic so we could reuse this pattern in other places in int maps