Final update to allow for bulk sending of emails