working attachments feature
working attachment feature - old work mixed in - not sure how
merge from commit 1f18667c1ebac4832cedf24c0e7ed19202fcf0ae