Attachment now works
tryin to pull from Jingsai and Xi
final attachment commit