update everything to using new Paginate class
pagination in class now also