WIP Reworking attachment handling

Round in a couple circles but getting there...