Moved some more stuff in to Paginator class