Re #99 Finish implementation (with pagination)