Added preliminary email stuff