Getting ready to merge pagination with master