Attachments

Add attachment support for #4