Added email and directory

Almost functional