Trying to add pagination. Not done yet