STILL better pagination

Fixes #10