Mail working but still need to fix to work better...