Core functionality finished - need test SMTP