Started refactoring collections and filters
Fingers crossed