Move this to email_steps?