Move collection logic around, get rid of DC.
Wrap stuff, to hopefully help with themeing.
Merge pull request #6 from adam-vessey/7.x-UMKC-21

Move collection logic around, get rid of DC.