MOAR work on attachments