Initial copy of Tony's SMTP stuff