Refactoring Added Security. Finished Basic Email