Pagination added, all tests green.