#26 - Added email functionality