More tying together, email working on server