Added controller and mailer