FREQ-54 Email refactor in progress