Port over diff code
Add attachments feature