in progress
in progress
Refactored to use single instances of collection and views