Giving puppy condidtional logic
adding underscore contrib
Adding pagination to public and server