I think that's all I have pretty much done, other than separating into two requirements.  I'd still like as many of these as possible to be granular.  I've talked to Lou and Tom about attachment behavior and this should line up with what is happening.  If I've changed something that we missed, let me know.