Inch closer to working pagination