Split off paginator stuff into new branch