More changes to get attachments working.
drwxr-xr-x - citadel