Added some initial smtp stuff