Initial implementation of email attachments
Code clean up (comments)