Finished pagination after simplifying back in January.