Now stores email address

Fixed potential NPE
Editing email doesnt work.
Updated todolist