Mail not yet working, added a little bit more progress though.