reorganizing the way we do attachments