Add collections
Add collections without always storing everything to db
Merge branch 'feature/collections'