Pagination

- [x] Pass on CI
- [x] Tests for new features
- [x] Code review