Xd 477 pagination

Embryo of proper pagination support