Collections.

Lots of changes but collections are working now.