First stab at adding attachments