Adding pagination and testing.