Work in progress - initial cut of add new collection
Refactoring.  Add/remove collection seems to be working now.