Working on Paging. See #1442, as suggested by @rossriley