Added primative email stuff