Feature sharecollection

I'll need to look at this to figure out the conflicts.
Need to merge to get access to new db.