Email added

Email implemented but currently disabled. Working on removing excess
fields.