Re-introduces paging, closes #162