factoring and refactoring factories
pagination with kaminari
Fix merge conflicts