Experimenting with infinite scroll, refactoring